Usage of new API, cleanups (reduced)

src/org/adblockplus/android/ProxySettings.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
@@ skipping 11 matching lines @@
 
 import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Parcelable;
 import android.util.Log;
 
 public class ProxySettings
 {
-  private final static String TAG = Utils.getTag(ProxySettings.class);
+  private static final String TAG = Utils.getTag(ProxySettings.class);
 
   public static Object getActiveLinkProxy(final ConnectivityManager connectivityManager) throws Exception
   {
-    // LinkProperties lp = connectivityManager.getActiveLinkProperties()
+    /*
+     * LinkProperties lp = connectivityManager.getActiveLinkProperties()
+     */
     final Method method = connectivityManager.getClass().getMethod("getActiveLinkProperties");
     final Object lp = method.invoke(connectivityManager);
 
     final Object pp = ProxySettings.getLinkProxy(lp);
     return pp;
   }
 
   /**
    * Reads proxy settings from link properties on Android 3.1+ using Java
    * reflection.
@@ skipping 35 matching lines @@
     }
     catch (final Exception e)
     {
       // This should not happen
       Log.e(TAG, "getProxy failure", e);
       return null;
     }
 
     try
     {
-      final ConnectivityManager connectivityManager = (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
+      final ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
       final Object pp = method.invoke(connectivityManager);
       if (pp == null)
-      {
         return null;
-      }
 
       return getUserProxy(pp);
     }
     catch (final Exception e)
     {
       // This should not happen
       Log.e(TAG, "getProxy failure", e);
       return null;
     }
   }
@@ skipping 11 matching lines @@
     final String[] userProxy = new String[3];
 
     final String className = "android.net.ProxyProperties";
     final Class<?> c = Class.forName(className);
     Method method;
 
     /*
      * String proxyHost = pp.getHost()
      */
     method = c.getMethod("getHost");
-    userProxy[0] = (String)method.invoke(pp);
+    userProxy[0] = (String) method.invoke(pp);
 
     /*
      * int proxyPort = pp.getPort();
      */
     method = c.getMethod("getPort");
     userProxy[1] = String.valueOf(method.invoke(pp));
 
     /*
      * String proxyEL = pp.getExclusionList()
      */
     method = c.getMethod("getExclusionList");
-    userProxy[2] = (String)method.invoke(pp);
+    userProxy[2] = (String) method.invoke(pp);
 
     if (userProxy[0] != null)
-    {
       return userProxy;
-    }
     else
-    {
-      return null;
-    }
+      return null;
   }
 
   /**
    * Tries to set local proxy in system settings via native call on Android 3.1+
    * devices using Java reflection.
    *
    * @return true if device supports native proxy setting
    */
   public static boolean setConnectionProxy(final Context context, final String host, final int port, final String excl)
   {
@@ skipping 12 matching lines @@
       return false;
     }
     catch (final Exception e)
     {
       // This should not happen
       Log.e(TAG, "setHttpProxy failure", e);
       return false;
     }
     try
     {
-      final ConnectivityManager connectivityManager = (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
+      final ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
       final Object lp = method.invoke(connectivityManager);
       // There is no active link now, but device has native proxy support
       if (lp == null)
-      {
         return true;
-      }
 
       final String className = "android.net.ProxyProperties";
       final Class<?> c = Class.forName(className);
       method = lp.getClass().getMethod("setHttpProxy", c);
       if (host != null)
       {
         /*
          * ProxyProperties pp = new ProxyProperties(host, port, excl);
          */
         final Class<?>[] parameter = new Class[] { String.class, int.class, String.class };
@@ skipping 25 matching lines @@
           break;
         case ConnectivityManager.TYPE_MOBILE:
           // TODO We leave it here for future, it does not work now
           // intent = new Intent("android.intent.action.ANY_DATA_STATE");
           break;
       }
       if (intent != null)
       {
         if (lp != null)
         {
-          intent.putExtra("linkProperties", (Parcelable)lp);
+          intent.putExtra("linkProperties", (Parcelable) lp);
         }
         context.sendBroadcast(intent);
       }
 
       return true;
     }
     catch (final SecurityException e)
     {
       // This is ok for 4.1.2+, 4.2.2+ and later
       return false;
     }
     catch (final Exception e)
     {
       // This should not happen
       Log.e(TAG, "setHttpProxy failure", e);
       return false;
     }
   }
 }