Usage of new API, cleanups (reduced)

src/org/adblockplus/android/ProxyService.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 41 matching lines @@
 import android.os.StrictMode;
 import android.preference.PreferenceManager;
 import android.support.v4.app.NotificationCompat;
 import android.util.Log;
 
 import com.stericson.RootTools.RootTools;
 import com.stericson.RootTools.RootToolsException;
 
 public class ProxyService extends Service implements OnSharedPreferenceChangeListener
 {
+  private static final String LOCALHOST = "127.0.0.1";
+  /**
+   * Indicates that system supports native proxy configuration.
+   */
+  public static final boolean NATIVE_PROXY_SUPPORTED = Build.VERSION.SDK_INT >= 12; // Honeycomb 3.1
+
   static
   {
     RootTools.debugMode = false;
   }
 
   private static final String TAG = Utils.getTag(ProxyService.class);

[Felix Dahlke, 2014/04/28 07:29:01]

What's the logic behind reordering these?

[René Jeschke, 2014/04/28 08:34:32]

Reverted.

-
-  private static final String LOCALHOST = "127.0.0.1";
-  /**
-   * Indicates that system supports native proxy configuration.
-   */
   private static final boolean logRequests = false;
 
-  public static final boolean NATIVE_PROXY_SUPPORTED = Build.VERSION.SDK_INT >= 12; // Honeycomb
-  private static final int NOTRAFFIC_NOTIFICATION_ID = R.string.app_name + 3;
-  static final int ONGOING_NOTIFICATION_ID = R.string.app_name;
-
-  private static final long POSITION_RIGHT = Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD ? Long.MIN_VALUE : Long.MAX_VALUE;
+  // Do not use 8080 because it is a "dirty" port, Android uses it if something goes wrong
+  // first element is reserved for previously used port
+  private static final int[] portVariants = new int[] {-1, 2020, 3030, 4040, 5050, 6060, 7070, 9090, 1234, 12345, 4321, 0};
 
   private static final int DEFAULT_TIMEOUT = 3000;
   private static final int NO_TRAFFIC_TIMEOUT = 5 * 60 * 1000; // 5 minutes
 
-  // Do not use 8080 because it is a "dirty" port, Android uses it if something
-  // goes wrong
-  // first element is reserved for previously used port
-  private static final int[] portVariants = new int[] { -1, 2020, 3030, 4040, 5050, 6060, 7070, 9090, 1234, 12345, 4321, 0 };
+  static final int ONGOING_NOTIFICATION_ID = R.string.app_name;
+  private static final long POSITION_RIGHT = Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD ? Long.MIN_VALUE : Long.MAX_VALUE;
+  private static final int NOTRAFFIC_NOTIFICATION_ID = R.string.app_name + 3;
 
   /**
    * Broadcasted when service starts or stops.
    */
   public static final String BROADCAST_STATE_CHANGED = "org.adblockplus.android.service.state";
   /**
    * Broadcasted if proxy fails to start.
    */
   public static final String BROADCAST_PROXY_FAILED = "org.adblockplus.android.proxy.failure";
 
@@ skipping 286 matching lines @@
     if (proxy != null)
       proxy.close();
 
     // Release service lock
     stopForeground(true);
 
     Log.i(TAG, "Service stopped");
   }
 
   /**
-   * Restores system proxy settings via native call on Android 3.1+ devices using Java reflection.
+   * Restores system proxy settings via native call on Android 3.1+ devices
+   * using Java reflection.
    */
   private void clearConnectionProxy()
   {
     final String proxyHost = proxyConfiguration.getProperty("adblock.proxyHost");
     final String proxyPort = proxyConfiguration.getProperty("adblock.proxyPort");
     final String proxyExcl = proxyConfiguration.getProperty("adblock.proxyExcl");
     int port = 0;
     try
     {
       if (proxyHost != null)
@@ skipping 225 matching lines @@
       return RootTools.sendShell(command, DEFAULT_TIMEOUT);
     }
     catch (final Exception e)
     {
       Log.e(TAG, "Failed to get iptables configuration", e);
       return null;
     }
   }
 
   /**
-   * Raises or removes no traffic notification based on current link proxy settings
+   * Raises or removes no traffic notification based on current link proxy
+   * settings
    */
   private void updateNoTrafficCheck(final ConnectivityManager connectivityManager)
   {
     try
     {
       final Object pp = ProxySettings.getActiveLinkProxy(connectivityManager);
       final String[] userProxy = ProxySettings.getUserProxy(pp);
       if (userProxy != null)
         Log.i(TAG, "Proxy settings: " + userProxy[0] + ":" + userProxy[1] + "(" + userProxy[2] + ")");
       updateNoTrafficCheck(userProxy);
@@ skipping 106 matching lines @@
     }
   }
 
   @Override
   public IBinder onBind(final Intent intent)
   {
     return binder;
   }
 
   /**
-   * Executed if no traffic is detected after a period of time. Notifies user about possible
-   * configuration problems.
+   * Executed if no traffic is detected after a period of time. Notifies user
+   * about possible configuration problems.
    */
   private final Runnable noTraffic = new Runnable()
   {
     @Override
     public void run()
     {
       // It's weird but notrafficHandler.removeCallbacks(noTraffic) does not remove this callback
       if (notrafficHandler == null)
         return;
       // Show warning notification
@@ skipping 49 matching lines @@
     public void onReceive(final Context context, final Intent intent)
     {
       if (intent.getAction().equals(ProxyService.BROADCAST_PROXY_FAILED))
       {
         stopSelf();
       }
     }
   };
 
   /**
-   * Monitors system network connection settings changes and updates proxy settings accordingly.
+   * Monitors system network connection settings changes and updates proxy
+   * settings accordingly.
    */
   private final BroadcastReceiver connectionReceiver = new BroadcastReceiver()
   {
     @Override
     public void onReceive(final Context ctx, final Intent intent)
     {
       final String action = intent.getAction();
       Log.i(TAG, "Action: " + action);
       // Connectivity change
       if (ConnectivityManager.CONNECTIVITY_ACTION.equals(action))
@@ skipping 75 matching lines @@
     @Override
     public void log(final int level, final Object obj, final String message)
     {
       if (level <= logLevel)
       {
         Log.println(7 - level, obj != null ? obj.toString() : TAG, message);
       }
     }
   }
 }