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 15 matching lines @@
 import android.net.NetworkInfo;
 import android.os.Parcelable;
 import android.util.Log;
 
 public class ProxySettings
 {
   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.
+   * Reads proxy settings from link properties on Android 3.1+ using Java
+   * reflection.
    *
    * @param linkProperties
    *          android.net.LinkProperties
    * @return ProxyProperties
    * @throws Exception
    */
   public static Object getLinkProxy(final Object linkProperties) throws Exception
   {
     /*
      * linkProperties.getHttpProxy();
@@ skipping 81 matching lines @@
     method = c.getMethod("getExclusionList");
     userProxy[2] = (String) method.invoke(pp);
 
     if (userProxy[0] != null)
       return userProxy;
     else
       return null;
   }
 
   /**
-   * Tries to set local proxy in system settings via native call on Android 3.1+ devices using Java
-   * reflection.
+   * 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)
   {
     Method method = null;
     try
     {
       /*
-       * android.net.LinkProperties lp = ConnectivityManager.getActiveLinkProperties();
+       * android.net.LinkProperties lp =
+       * ConnectivityManager.getActiveLinkProperties();
        */
       method = ConnectivityManager.class.getMethod("getActiveLinkProperties");
     }
     catch (final NoSuchMethodException e)
     {
       // This is normal situation for pre-ICS devices
       return false;
     }
     catch (final Exception e)
     {
@@ skipping 66 matching lines @@
       return false;
     }
     catch (final Exception e)
     {
       // This should not happen
       Log.e(TAG, "setHttpProxy failure", e);
       return false;
     }
   }
 }