ABP/Android Port travel

src/org/adblockplus/android/ProxyService.java

 /*
  * This file is part of the Adblock Plus,
  * Copyright (C) 2006-2012 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 34 matching lines @@
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Proxy;
 import android.os.Binder;
 import android.os.Build;
 import android.os.Handler;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
 import android.support.v4.app.NotificationCompat;
 import android.util.Log;
-import android.widget.Toast;
 
 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 boolean hasNativeProxy = Build.VERSION.SDK_INT >= 12; // Honeycomb 3.1
 
   static
   {
     RootTools.debugMode = false;
   }
 
   private static final String TAG = "ProxyService";
   private static final boolean logRequests = false;
 
+  private static final int[] portVariants = new int[] {8080, 8888, 1111, 2222, 3333, 4444, 5555, 6666, 7777, 9999, 26571, 0};

[Felix Dahlke, 2013/02/20 12:39:02]

Maybe it makes sense to have this in arrays.xml instead, as the single port was
in integers.xml before?

[Andrey Novikov, 2013/02/20 12:44:23]

It was there historically - because first versions had it configurable. This was
the default value for preferences. As you can see I have removed preference
reading code.

[Felix Dahlke, 2013/02/20 12:50:41]

Right, still wondering if we should put magic values like that in resources or
not. Don't see a big advantage, it's up to you.

+
   private final static int DEFAULT_TIMEOUT = 3000;
   private final static int NO_TRAFFIC_TIMEOUT = 5 * 60 * 1000; // 5 minutes
 
   final static 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 final static int NOTRAFFIC_NOTIFICATION_ID = R.string.app_name + 3;
 
   /**
    * Broadcasted when service starts or stops.
    */
@@ skipping 30 matching lines @@
 
   @Override
   public void onCreate()
   {
     super.onCreate();
 
     // Get port for local proxy
     SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
     Resources resources = getResources();
 
-    String p = prefs.getString(getString(R.string.pref_port), null);
-    try
-    {
-      port = p != null ? Integer.valueOf(p) : resources.getInteger(R.integer.def_port);
-    }
-    catch (NumberFormatException e)
-    {
-      Toast.makeText(this, getString(R.string.msg_badport) + ": " + p, Toast.LENGTH_LONG).show();
-      port = resources.getInteger(R.integer.def_port);
-    }
-
     // Try to read user proxy settings
     String proxyHost = null;
     String proxyPort = null;
     String proxyExcl = null;
     String proxyUser = null;
     String proxyPass = null;
 
     if (hasNativeProxy)
     {
       // Read system settings
@@ skipping 70 matching lines @@
     // Start engine
     AdblockPlus.getApplication().startEngine();
 
     registerReceiver(proxyReceiver, new IntentFilter(ProxyService.BROADCAST_PROXY_FAILED));
     registerReceiver(matchesReceiver, new IntentFilter(AdblockPlus.BROADCAST_FILTER_MATCHES));
 
     // Start proxy
     if (proxy == null)
     {
       ServerSocket listen = null;
-      try
+      String msg = null;
+      for (int p : portVariants)
       {
-        // TODO Add port travel
-        listen = new ServerSocket(port, 1024);
+        try
+        {
+          listen = new ServerSocket(p, 1024);
+          port = p;
+          break;
+        }
+        catch (IOException e)
+        {
+          Log.e(TAG, null, e);
+          msg = e.getMessage();
+        }
       }
-      catch (IOException e)
+      if (listen == null)
       {
-        sendBroadcast(new Intent(BROADCAST_PROXY_FAILED).putExtra("msg", e.getMessage()));
-        Log.e(TAG, null, e);
+        sendBroadcast(new Intent(BROADCAST_PROXY_FAILED).putExtra("msg", msg));
         return;
       }
 
       proxyConfiguration.put("handler", "main");
       proxyConfiguration.put("main.prefix", "");
       proxyConfiguration.put("main.class", "sunlabs.brazil.server.ChainHandler");
       if (transparent)
       {
         proxyConfiguration.put("main.handlers", "urlmodifier adblock");
         proxyConfiguration.put("urlmodifier.class", "org.adblockplus.brazil.TransparentProxyHandler");
@@ skipping 403 matching lines @@
 
   @SuppressLint("NewApi")
   private Notification getNotification()
   {
     int msgId = R.string.notif_waiting;
     if (nativeProxy || proxyManualyConfigured)
       msgId = R.string.notif_wifi;
     if (transparent)
       msgId = R.string.notif_all;
 
-    Log.e(TAG, "V: " + nativeProxy + " " + proxyManualyConfigured + " " + transparent);

[Felix Dahlke, 2013/02/20 12:39:02]

Is this change related?

[Andrey Novikov, 2013/02/20 12:44:23]

Of course not, just forgot to remove it before previous commit.

     NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
     if (hideIcon && msgId != R.string.notif_waiting)
     {
       builder.setWhen(POSITION_RIGHT);
       builder.setSmallIcon(R.drawable.transparent);
       //builder.setContent(new RemoteViews(getPackageName(), R.layout.notif_hidden));
     }
     else
     {
       builder.setWhen(0);
@@ skipping 187 matching lines @@
     @Override
     public void log(int level, Object obj, String message)
     {
       if (level <= logLevel)
       {
         Log.println(7 - level, obj != null ? obj.toString() : TAG, message);
       }
     }
   }
 }