Proxy configurators

src/org/adblockplus/android/configurators/NativeProxyConfigurator.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 48 matching lines @@
     try
     {
       final ConnectivityManager conMan = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
       final NetworkInfo ni = conMan.getActiveNetworkInfo();
 
       final Object lp;
 
       // Check if we're currently running on WiFi
       if (ni != null && ni.getType() == ConnectivityManager.TYPE_WIFI)
       {
-        // I'm using reflection directly here to keep this method self-contained.

[Felix Dahlke, 2014/08/24 11:51:19]

Should rather be "We're" instead of "I'm" :). Or just "Using reflection directly
here [...]"

Same below.

[René Jeschke, 2014/08/24 11:54:14]

Done.

+        // We're using reflection directly here to keep this method self-contained.
         lp = conMan.getClass()
             .getMethod("getActiveLinkProperties")
             .invoke(conMan);
       }
       else
       // We're not running on WiFi so get the last used WiFi link properties
       {
-        // I'm using reflection directly here to keep this method self-contained.
+        // We're using reflection directly here to keep this method self-contained.
         lp = conMan.getClass()
             .getMethod("getLinkProperties", int.class)
             .invoke(conMan, ConnectivityManager.TYPE_WIFI);
       }
 
       if (lp == null)
       {
         // Is this even possible?
         throw new IllegalStateException("No WiFi?");
       }
@@ skipping 17 matching lines @@
     {
       this.context.registerReceiver(this.wiFiChangeReceiver, new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
       return true;
     }
 
     return false;
   }
 
   private boolean sendIntent(final LinkProperties lp, final ProxyProperties proxyProperties)
   {
-    boolean success = true;
-
     final ConnectivityManager conMan = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
     final NetworkInfo ni = conMan.getActiveNetworkInfo();
 
     if (ni != null && ni.getType() == ConnectivityManager.TYPE_WIFI)
     {
       final Intent intent = new Intent("android.net.wifi.LINK_CONFIGURATION_CHANGED");
 
       if (lp.isValid())
       {
         try
         {
           lp.setHttpProxy(proxyProperties);
           intent.putExtra("linkProperties", (Parcelable) lp.getLinkProperties());
           context.sendBroadcast(intent);
         }
         catch (final Exception e)
         {
           // Catch all, again
-          success = false;

[Felix Dahlke, 2014/08/24 11:51:19]

Why not just "return false" here and "return true" below?

[René Jeschke, 2014/08/24 11:54:14]

Done.

+          return false;
         }
       }
     }
 
-    return success;
+    return true;
   }
 
   private boolean registerProxy(final ProxyProperties proxyProperties)
   {
     try
     {
       final ConnectivityManager conMan = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
 
       return this.sendIntent(LinkProperties.getActiveLinkProperties(conMan), proxyProperties);
     }
@@ skipping 72 matching lines @@
         final NetworkInfo ni = connectivityManager.getActiveNetworkInfo();
 
         if (ni != null && ni.getType() == ConnectivityManager.TYPE_WIFI && ni.isAvailable() && ni.isConnected())
         {
           this.configurator.reRegisterProxy();
         }
       }
     }
   }
 }