ABP/Android Remember lart port used

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 56 matching lines @@
 
   static
   {
     RootTools.debugMode = false;
   }
 
   private static final String TAG = "ProxyService";
   private static final boolean logRequests = true;
 
   // Do not use 8080 because it is a "dirty" port, Android uses it if something goes wrong
-  private static final int[] portVariants = new int[] {2020, 3030, 4040, 5050, 6060, 7070, 9090, 1234, 12345, 4321, 0};
+  // 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 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 117 matching lines @@
     {
       // Try to set native proxy
       nativeProxyAutoConfigured = ProxySettings.setConnectionProxy(getApplicationContext(), LOCALHOST, port, "");
 
       if (NATIVE_PROXY_SUPPORTED)
       {
         registerReceiver(connectionReceiver, new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
         registerReceiver(connectionReceiver, new IntentFilter(Proxy.PROXY_CHANGE_ACTION));
       }
     }
-    
+
     // Save current native proxy situation. The service is always started on the first run so
     // we will always have a correct value from the box
     SharedPreferences.Editor editor = prefs.edit();
     editor.putBoolean(getString(R.string.pref_proxyautoconfigured), transparent || nativeProxyAutoConfigured);
     editor.commit();
 
     registerReceiver(proxyReceiver, new IntentFilter(ProxyService.BROADCAST_PROXY_FAILED));
     registerReceiver(filterReceiver, new IntentFilter(AdblockPlus.BROADCAST_FILTERING_CHANGE));
     registerReceiver(filterReceiver, new IntentFilter(AdblockPlus.BROADCAST_FILTER_MATCHES));
 
     // Start proxy
     if (proxy == null)
     {
+      // Select available port and bind to it, use previously selected port by default
+      portVariants[0] = prefs.getInt(getString(R.string.pref_lastport), -1);

[Felix Dahlke, 2013/03/13 13:16:49]

I think it would be more elegant here to convert the array to a List and add an
element to the front there. Means we wouldn't have to deal with -1.

[Andrey Novikov, 2013/03/13 13:22:38]

This was the first what I thought about but constructing dynamic array just for
one push is redundant imho. 

[Felix Dahlke, 2013/03/13 13:24:57]

But it's less error-prone (this would fall apart if you try and move -1 to a
different position above), and since this part is clearly not that performance
sensitive...

       ServerSocket listen = null;
       String msg = null;
       for (int p : portVariants)
       {
+        if (p < 0)
+          continue;
         try
         {
           listen = new ServerSocket(p, 1024);
           port = p;
           break;
         }
         catch (IOException e)
         {
           Log.e(TAG, null, e);
           msg = e.getMessage();
         }
       }
       if (listen == null)
       {
         sendBroadcast(new Intent(BROADCAST_PROXY_FAILED).putExtra("msg", msg));
         return;
       }
 
+      // Save selected port
+      editor.putInt(getString(R.string.pref_lastport), port);
+      editor.commit();
+
+      // Initialize proxy
       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");
       }
       else
       {
         proxyConfiguration.put("main.handlers", "https adblock");
         proxyConfiguration.put("https.class", "org.adblockplus.brazil.SSLConnectionHandler");
       }
       proxyConfiguration.put("adblock.class", "org.adblockplus.brazil.RequestHandler");
       if (logRequests)
         proxyConfiguration.put("adblock.proxylog", "yes");
 
       configureUserProxy(proxyConfiguration, proxyHost, proxyPort, proxyExcl, proxyUser, proxyPass);
 
       proxy = new ProxyServer();
       proxy.logLevel = Server.LOG_DIAGNOSTIC;
       proxy.setup(listen, proxyConfiguration.getProperty("handler"), proxyConfiguration);
       proxy.start();
     }
-    
+
     if (transparent)
     {
       // Redirect traffic via iptables
       try
       {
         StringBuffer cmd = new StringBuffer();
         cmd.append(iptables);
         cmd.append(IPTABLES_ADD_HTTP.replace("{{PORT}}", String.valueOf(port)));
         String rules = cmd.toString();
         RootTools.sendShell(rules, DEFAULT_TIMEOUT);
@@ skipping 232 matching lines @@
     return nativeProxyAutoConfigured;
   }
 
   /**
    * Checks if user has to set proxy settings manually
    */
   public boolean isManual()
   {
     return !transparent && !nativeProxyAutoConfigured;
   }
-  
+
   /**
    * Checks whether traffic check is pending
    */
   public boolean noTraffic()
   {
     return notrafficHandler != null;
   }
 
   /**
    * Checks if specified host is local.
@@ skipping 172 matching lines @@
     else
     {
       builder.setWhen(0);
       builder.setSmallIcon(R.drawable.ic_stat_blocking);
     }
     PendingIntent contentIntent = PendingIntent.getActivity(this, 0, new Intent(this, Preferences.class).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK), 0);
     builder.setContentIntent(contentIntent);
     builder.setContentTitle(getText(R.string.app_name));
     builder.setContentText(getString(msgId, port));
     builder.setOngoing(true);
-    
+
     Notification notification = builder.getNotification();
     return notification;
   }
 
   public void setEmptyIcon(boolean hide)
   {
     hideIcon = hide;
     NotificationManager notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
     notificationManager.notify(ONGOING_NOTIFICATION_ID, getNotification());
   }
@@ skipping 178 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);
       }
     }
   }
 }