ABP/Android Proxy switch

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 52 matching lines @@
    * 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 = "ProxyService";
-  private static final boolean logRequests = false;
+  private static final boolean logRequests = true;
 
-  private static final int[] portVariants = new int[] {8080, 8888, 1111, 2222, 3333, 4444, 5555, 6666, 7777, 9999, 26571, 0};
+  // Do not use 8080 because it is a "dirty" port, Android uses it if something goes wrong
+  private static final int[] portVariants = new int[] {8888, 1111, 2222, 3333, 4444, 5555, 6666, 7777, 9999, 26571, 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 110 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));
       }
     }
-
-    // Start engine
-    AdblockPlus.getApplication().startEngine();
+    
+    // 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(matchesReceiver, new IntentFilter(AdblockPlus.BROADCAST_FILTER_MATCHES));
+    registerReceiver(filterReceiver, new IntentFilter(AdblockPlus.BROADCAST_FILTERING_CHANGE));
+    registerReceiver(filterReceiver, new IntentFilter(AdblockPlus.BROADCAST_FILTER_MATCHES));
 
     // Start proxy
     if (proxy == null)
     {
       ServerSocket listen = null;
       String msg = null;
       for (int p : portVariants)
       {
         try
         {
@@ skipping 62 matching lines @@
     return START_STICKY;
   }
 
   @Override
   public void onDestroy()
   {
     super.onDestroy();
 
     stopNoTrafficCheck();
 
-    unregisterReceiver(matchesReceiver);
+    unregisterReceiver(filterReceiver);
     unregisterReceiver(proxyReceiver);
 
     // Stop IP redirecting
     if (transparent)
     {
       new Thread()
       {
         @Override
         public void run()
         {
@@ skipping 17 matching lines @@
     {
       clearConnectionProxy();
     }
 
     sendBroadcast(new Intent(BROADCAST_STATE_CHANGED).putExtra("enabled", false));
 
     // Stop proxy server
     if (proxy != null)
       proxy.close();
 
+    // TODO Do we have to check current state?
     // Stop engine if not in interactive mode
     AdblockPlus.getApplication().stopEngine(false);
 
     // Release service lock
     stopForeground(true);
 
     Log.i(TAG, "Service stopped");
   }
 
   /**
@@ skipping 293 matching lines @@
    * Stops no traffic check and resets notification message.
    */
   private void stopNoTrafficCheck()
   {
     if (notrafficHandler != null)
     {
       notrafficHandler.removeCallbacks(noTraffic);
       sendStateChangedBroadcast();
       NotificationManager notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
       notificationManager.notify(ONGOING_NOTIFICATION_ID, getNotification());
+      notificationManager.cancel(NOTRAFFIC_NOTIFICATION_ID);
     }
     notrafficHandler = null;
   }
 
   @SuppressLint("NewApi")
   private Notification getNotification()
   {
+    boolean filtering = AdblockPlus.getApplication().isFilteringEnabled();
+
     int msgId = R.string.notif_waiting;
     if (nativeProxyAutoConfigured || proxyManualyConfigured)
-      msgId = R.string.notif_wifi;
+      msgId = filtering ? R.string.notif_wifi : R.string.notif_wifi_nofiltering;
     if (transparent)
       msgId = R.string.notif_all;
 
     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);
       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(getText(msgId));
+    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 49 matching lines @@
       builder.setContentTitle(getText(R.string.app_name));
       builder.setContentText(getText(R.string.notif_notraffic));
       NotificationManager notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
       notificationManager.notify(NOTRAFFIC_NOTIFICATION_ID, builder.getNotification());
     }
   };
 
   /**
    * Stops no traffic check if traffic is detected by proxy service.
    */
-  private BroadcastReceiver matchesReceiver = new BroadcastReceiver()
+  private BroadcastReceiver filterReceiver = new BroadcastReceiver()
   {
     @Override
     public void onReceive(final Context context, Intent intent)
     {
+      if (intent.getAction().equals(AdblockPlus.BROADCAST_FILTERING_CHANGE))
+      {
+        NotificationManager notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+        notificationManager.notify(ONGOING_NOTIFICATION_ID, getNotification());
+      }
       if (intent.getAction().equals(AdblockPlus.BROADCAST_FILTER_MATCHES))
       {
         proxyManualyConfigured = true;
         stopNoTrafficCheck();
       }
     }
   };
 
   /**
    * Stops service if proxy fails.
@@ skipping 100 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);
       }
     }
   }
 }