Proxy configurators

src/org/adblockplus/android/Utils.java

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package org.adblockplus.android;
 
-import java.util.concurrent.locks.ReentrantLock;
-
 import org.adblockplus.android.configurators.NativeProxyConfigurator;
 import org.adblockplus.android.updater.UpdaterActivity;
 import org.adblockplus.libadblockplus.JsValue;
 import org.adblockplus.libadblockplus.Subscription;
 import org.apache.commons.lang.StringUtils;
 
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.support.v4.app.NotificationCompat;
 
 public final class Utils
 {
-  private static final ReentrantLock LOCK = new ReentrantLock();
   private static boolean nativeProxySupportChecked = false;
   private static boolean nativeProxySupported = false;
 
   private Utils()
   {
     //
   }
 
-  public static boolean isNativeProxySupported(final Context context)
+  public static synchronized boolean isNativeProxySupported(final Context context)
   {
-    LOCK.lock();

[Felix Dahlke, 2014/08/19 16:14:46]

Wouldn't a synchronize method have the same effect here?

[René Jeschke, 2014/08/19 16:33:24]

Yeah, right, somehow I used a lock before, that method got copied from somewhere
else^^

Changed.

-    try
+    if (!nativeProxySupportChecked)
     {
-      if (!nativeProxySupportChecked)
-      {
-        nativeProxySupported = NativeProxyConfigurator.canUse(context);
-        nativeProxySupportChecked = true;
-      }
+      nativeProxySupported = NativeProxyConfigurator.canUse(context);
+      nativeProxySupportChecked = true;
+    }
 
-      return nativeProxySupported;
-    }
-    finally
-    {
-      LOCK.unlock();
-    }
+    return nativeProxySupported;
   }
 
   public static String getTag(final Class<?> clazz)
   {
     return clazz.getSimpleName();
   }
 
   public static String capitalizeString(final String s)
   {
     if (s == null || s.length() == 0)
@@ skipping 65 matching lines @@
       time = lastDownload;
       status = "synchronize_last_at";
     }
 
     context.sendBroadcast(new Intent(AdblockPlus.BROADCAST_SUBSCRIPTION_STATUS)
         .putExtra("url", sub.getProperty("url").toString())
         .putExtra("status", status)
         .putExtra("time", time * 1000L));
   }
 }