ABP/Android Manual proxy user notifications

src/org/adblockplus/android/Preferences.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.preference.ListPreference;
 import android.preference.PreferenceManager;
 import android.text.format.DateFormat;
 import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
 
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
-import com.actionbarsherlock.view.Window;
 
 /**
  * Main settings UI.
  */
 public class Preferences extends SummarizedPreferences
 {
   private static final String TAG = "Preferences";
 
   private static final int ABOUT_DIALOG = 1;
   private static final int HIDEICONWARNING_DIALOG = 2;
-  
+
   private static ProxyService proxyService = null;
 
   private RefreshableListPreference subscriptionList;
-  
-  private boolean trafficDetected = false;
+
   private String subscriptionSummary;
 
   @Override
   public void onCreate(Bundle savedInstanceState)
   {
     super.onCreate(savedInstanceState);
 
     PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
     PreferenceManager.setDefaultValues(this, R.xml.preferences_advanced, false);
     setContentView(R.layout.preferences);
@@ skipping 27 matching lines @@
     String[] entries = new String[subscriptions.size()];
     String[] entryValues = new String[subscriptions.size()];
     int i = 0;
     for (Subscription subscription : subscriptions)
     {
       entries[i] = subscription.title;
       entryValues[i] = subscription.url;
       i++;
     }
     subscriptionList.setEntries(entries);
-    subscriptionList.setEntryValues(entryValues);  
+    subscriptionList.setEntryValues(entryValues);
   }
 
   @Override
   protected void onStart()
   {
     super.onStart();
     AdblockPlus application = AdblockPlus.getApplication();
     application.startEngine();
     application.startInteractive();
   }
 
   @Override
   public void onResume()
   {
     super.onResume();
     SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
     final AdblockPlus application = AdblockPlus.getApplication();
 
     boolean firstRun = false;
 
     // Get current subscription
     String current = prefs.getString(getString(R.string.pref_subscription), (String) null);
-    
+
     // If there is no current subscription autoselect one
     if (current == null)
     {
       firstRun = true;
       Subscription offer = application.offerSubscription();
       current = offer.url;
       if (offer != null)
       {
         subscriptionList.setValue(offer.url);
         application.setSubscription(offer);
@@ skipping 13 matching lines @@
     });
 
     // Set subscription status message
     if (subscriptionSummary != null)
       subscriptionList.setSummary(subscriptionSummary);
     else
       setPrefSummary(subscriptionList);
 
     // Time to start listening for events
     registerReceiver(receiver, new IntentFilter(AdblockPlus.BROADCAST_SUBSCRIPTION_STATUS));
-    registerReceiver(receiver, new IntentFilter(AdblockPlus.BROADCAST_FILTER_MATCHES));
     registerReceiver(receiver, new IntentFilter(ProxyService.BROADCAST_STATE_CHANGED));
     registerReceiver(receiver, new IntentFilter(ProxyService.BROADCAST_PROXY_FAILED));
 
     final String url = current;
 
     // Initialize subscription verification
     (new Thread()
     {
       @Override
       public void run()
@@ skipping 25 matching lines @@
   @Override
   public void onPause()
   {
     super.onPause();
     try
     {
       unregisterReceiver(receiver);
     }
     catch (IllegalArgumentException e)
     {
-      // ignore - it is thrown if receiver is not registered but it can not be true in normal conditions
+      // ignore - it is thrown if receiver is not registered but it can not be
+      // true in normal conditions
     }
     unbindService(proxyServiceConnection);
     proxyService = null;
+    
+    hideConfigurationMsg();
   }
 
   @Override
   protected void onStop()
   {
     super.onStop();
     SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
     boolean enabled = prefs.getBoolean(getString(R.string.pref_enabled), false);
     AdblockPlus application = AdblockPlus.getApplication();
     application.stopInteractive();
@@ skipping 33 matching lines @@
   private void setEnabled(boolean enabled)
   {
     SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(this).edit();
     editor.putBoolean(getString(R.string.pref_enabled), enabled);
     editor.commit();
     ((CheckBoxPreference) findPreference(getString(R.string.pref_enabled))).setChecked(enabled);
   }
 
   /**
    * Checks if ProxyService is running.
-   *
+   * 
    * @return true if service is running
    */
   private boolean isServiceRunning()
   {
     ActivityManager manager = (ActivityManager) getSystemService(ACTIVITY_SERVICE);
     // Actually it returns not only running services, so extra check is required
     for (RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE))
     {
       if ("org.adblockplus.android.ProxyService".equals(service.service.getClassName()) && service.pid > 0)
         return true;
@@ skipping 112 matching lines @@
   {
     @Override
     public void onReceive(Context context, Intent intent)
     {
       String action = intent.getAction();
       Bundle extra = intent.getExtras();
       if (action.equals(ProxyService.BROADCAST_STATE_CHANGED))
       {
         if (extra.getBoolean("enabled"))
         {
-          // If service is enabled in manual mode, show configuration message
+          // Service is enabled in manual mode
           if (extra.getBoolean("manual"))
           {
-            showConfigurationMsg(getString(R.string.msg_configuration, extra.getInt("port")));
+            // Proxy is properly configured
+            if (extra.getBoolean("configured"))
+              hideConfigurationMsg();
+            else
+              showConfigurationMsg(getString(R.string.msg_configuration, extra.getInt("port")));
           }
         }
         else
         {
           setEnabled(false);
           hideConfigurationMsg();
         }
       }
-      if (action.equals(AdblockPlus.BROADCAST_FILTER_MATCHES))
-      {
-        // Hide configuration message if traffic is detected for the first time
-        if (!trafficDetected)
-          hideConfigurationMsg();
-        trafficDetected = true;
-      }
       if (action.equals(ProxyService.BROADCAST_PROXY_FAILED))
       {
         String msg = extra.getString("msg");
         new AlertDialog.Builder(Preferences.this).setTitle(R.string.error).setMessage(msg).setIcon(android.R.drawable.ic_dialog_alert).setPositiveButton(R.string.ok, null).create().show();
         setEnabled(false);
       }
       if (action.equals(AdblockPlus.BROADCAST_SUBSCRIPTION_STATUS))
       {
         final String text = extra.getString("text");
         final long time = extra.getLong("time");
         runOnUiThread(new Runnable()
         {
           public void run()
           {
             setSubscriptionStatus(text, time);
           }
         });
       }
     }
   };
 
   /**
    * Constructs and updates subscription status text.
-   *
+   * 
    * @param text
    *          status message
    * @param time
    *          time of last change
    */
   private void setSubscriptionStatus(String text, long time)
   {
     ListPreference subscriptionList = (ListPreference) findPreference(getString(R.string.pref_subscription));
     CharSequence summary = subscriptionList.getEntry();
     StringBuilder builder = new StringBuilder();
@@ skipping 22 matching lines @@
       }
       subscriptionSummary = builder.toString();
       subscriptionList.setSummary(subscriptionSummary);
     }
   }
 
   @Override
   protected void onRestoreInstanceState(Bundle state)
   {
     super.onRestoreInstanceState(state);
-    trafficDetected = state.getBoolean("trafficDetected");
     subscriptionSummary = state.getString("subscriptionSummary");
   }
 
   @Override
   protected void onSaveInstanceState(Bundle outState)
   {
     outState.putString("subscriptionSummary", subscriptionSummary);
-    outState.putBoolean("trafficDetected", trafficDetected);
     super.onSaveInstanceState(outState);
   }
 
   private ServiceConnection proxyServiceConnection = new ServiceConnection()
   {
     public void onServiceConnected(ComponentName className, IBinder service)
     {
       proxyService = ((ProxyService.LocalBinder) service).getService();
       Log.d(TAG, "Proxy service connected");
 
-      if (!trafficDetected && proxyService.isManual())
-          showConfigurationMsg(getString(R.string.msg_configuration, proxyService.port));
+      if (proxyService.isManual() && proxyService.noTraffic())
+        showConfigurationMsg(getString(R.string.msg_configuration, proxyService.port));
     }
 
     public void onServiceDisconnected(ComponentName className)
     {
       proxyService = null;
       Log.d(TAG, "Proxy service disconnected");
     }
   };
 }