ABP/Android Notification not showing fix

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 10 matching lines @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;
 import android.app.AlertDialog;
 import android.content.BroadcastReceiver;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.ServiceConnection;
 import android.content.DialogInterface.OnDismissListener;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.AssetManager;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.IBinder;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.PreferenceManager;
 import android.text.format.DateFormat;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.Window;
 import android.widget.TextView;
 
 /**
  * Main settings UI.
  */
 public class Preferences extends SummarizedPreferences
 {
   private static final String TAG = "Preferences";
 
+  private static ProxyService proxyService = null;
+
   private AboutDialog aboutDialog;
   private boolean showAbout = false;
-  private String configurationMsg;
+  private boolean trafficDetected = false;
   private String subscriptionSummary;
 
   @Override
   public void onCreate(Bundle savedInstanceState)
   {
     requestWindowFeature(Window.FEATURE_NO_TITLE);
 
     super.onCreate(savedInstanceState);
 
     PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
@@ skipping 116 matching lines @@
     {
       setEnabled(false);
     }
     // Run service if this is first application run
     else if (!enabled && firstRun)
     {
       startService(new Intent(this, ProxyService.class));
       setEnabled(true);
     }
 
-    // Process screen rotation
-    if (configurationMsg != null)
-      showConfigurationMsg(configurationMsg);
-
     if (showAbout)
       onAbout(findViewById(R.id.btn_about));
+    
+    bindService(new Intent(this, ProxyService.class), proxyServiceConnection, 0);
   }
 
   @Override
   public void onPause()
   {
     super.onPause();
     unregisterReceiver(receiver);
+    unbindService(proxyServiceConnection);
+    proxyService = null;
   }
 
   @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 139 matching lines @@
       application.setSubscription(subscription);
     }
     super.onSharedPreferenceChanged(sharedPreferences, key);
   }
 
   private void showConfigurationMsg(String message)
   {
     TextView msg = (TextView) findViewById(R.id.txt_configuration);
     msg.setText(message);
     msg.setVisibility(View.VISIBLE);
-    configurationMsg = message;
   }
 
   private void hideConfigurationMsg()
   {
-    if (configurationMsg == null)
-      return;
     TextView msg = (TextView) findViewById(R.id.txt_configuration);
     msg.setVisibility(View.GONE);
-    configurationMsg = null;
   }
 
   private BroadcastReceiver receiver = new BroadcastReceiver()
   {
     @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
           if (extra.getBoolean("manual"))
           {
             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
-        hideConfigurationMsg();
+        // Hide configuration message if traffic is detected for the first time
+        if (! trafficDetected)

[Felix Dahlke, 2012/11/23 13:19:43]

Preferably no space after ! here.

[Andrey Novikov, 2012/11/30 09:43:39]

Done.

+          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");
@@ skipping 48 matching lines @@
       subscriptionSummary = builder.toString();
       subscriptionList.setSummary(subscriptionSummary);
     }
   }
 
   @Override
   protected void onRestoreInstanceState(Bundle state)
   {
     super.onRestoreInstanceState(state);
     showAbout = state.getBoolean("showAbout");
-    configurationMsg = state.getString("configurationMsg");
+    trafficDetected = state.getBoolean("trafficDetected");
     subscriptionSummary = state.getString("subscriptionSummary");
   }
 
   @Override
   protected void onSaveInstanceState(Bundle outState)
   {
     outState.putString("subscriptionSummary", subscriptionSummary);
-    outState.putString("configurationMsg", configurationMsg);
+    outState.putBoolean("trafficDetected", trafficDetected);
     outState.putBoolean("showAbout", showAbout);
     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())

[Felix Dahlke, 2012/11/23 13:19:43]

Preferably no space after ! here.

[Andrey Novikov, 2012/11/30 09:43:39]

Done.

+          showConfigurationMsg(getString(R.string.msg_configuration, proxyService.port));
+    }
+
+    public void onServiceDisconnected(ComponentName className)
+    {
+      proxyService = null;
+      Log.d(TAG, "Proxy service disconnected");
+    }
+  };
 }