android: notification icon option

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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package org.adblockplus.android;
 
 import java.io.IOException;
 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.app.Dialog;
 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.ServiceConnection;
 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 final int ABOUT_DIALOG = 1;
+  private static final int HIDEICONWARNING_DIALOG = 2;
+  
   private static ProxyService proxyService = null;
 
   private RefreshableListPreference subscriptionList;
   
-  private AboutDialog aboutDialog;
-  private boolean showAbout = false;
   private boolean trafficDetected = false;
   private String subscriptionSummary;
 
   @Override
   public void onCreate(Bundle savedInstanceState)
   {
     requestWindowFeature(Window.FEATURE_NO_TITLE);
 
     super.onCreate(savedInstanceState);
 
@@ skipping 121 matching lines @@
     {
       setEnabled(false);
     }
     // Run service if this is first application run
     else if (!enabled && firstRun)
     {
       startService(new Intent(this, ProxyService.class));
       setEnabled(true);
     }
 
-    if (showAbout)
-      onAbout(findViewById(R.id.btn_about));
-    
     bindService(new Intent(this, ProxyService.class), proxyServiceConnection, 0);
   }
 
   @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
     }
     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();
     if (!enabled)
       application.stopEngine(true);
-
-    if (aboutDialog != null)
-      aboutDialog.dismiss();
   }
 
   @Override
   public boolean onCreateOptionsMenu(Menu menu)
   {
     MenuInflater inflater = getMenuInflater();
     inflater.inflate(R.menu.menu_preferences, menu);
     return true;
   }
 
@@ skipping 82 matching lines @@
     Uri uri = Uri.parse(getString(R.string.configuring_url));
     Intent intent = new Intent(Intent.ACTION_VIEW, uri);
     startActivity(intent);
   }
 
   /**
    * Shows about dialog.
    */
   public void onAbout(View view)
   {
-    aboutDialog = new AboutDialog(this);
-    aboutDialog.setOnDismissListener(new OnDismissListener()
-    {
-
-      @Override
-      public void onDismiss(DialogInterface dialog)
-      {
-        showAbout = false;
-        aboutDialog = null;
-      }
-    });
-    showAbout = true;
-    aboutDialog.show();
+    showDialog(ABOUT_DIALOG);
   }
 
   @Override
+  protected Dialog onCreateDialog(int id)
+  {
+    Dialog dialog = null;
+    switch (id)
+    {
+      case ABOUT_DIALOG:
+        dialog = new AboutDialog(this);
+        break;
+      case HIDEICONWARNING_DIALOG:
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(R.string.warning).setMessage(R.string.msg_hideicon_warning).setIcon(android.R.drawable.ic_dialog_alert).setCancelable(false)
+            .setPositiveButton(R.string.gotit, new DialogInterface.OnClickListener()
+            {
+              public void onClick(DialogInterface dialog, int id)
+              {
+                dialog.cancel();
+              }
+            });
+        dialog = builder.create();
+        break;
+    }
+    return dialog;
+  }
+
+  @Override
   public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key)
   {
     if (getString(R.string.pref_enabled).equals(key))
     {
       boolean enabled = sharedPreferences.getBoolean(key, false);
       boolean serviceRunning = isServiceRunning();
       if (enabled && !serviceRunning)
         startService(new Intent(this, ProxyService.class));
       else if (!enabled && serviceRunning)
         stopService(new Intent(this, ProxyService.class));
     }
-    if (getString(R.string.pref_subscription).equals(key))
+    else if (getString(R.string.pref_subscription).equals(key))
     {
       String current = sharedPreferences.getString(key, null);
       AdblockPlus application = AdblockPlus.getApplication();
       Subscription subscription = application.getSubscription(current);
       application.setSubscription(subscription);
     }
+    else if (getString(R.string.pref_hideicon).equals(key))
+    {
+      boolean hideIcon = sharedPreferences.getBoolean(key, false);
+      if (hideIcon)
+        showDialog(HIDEICONWARNING_DIALOG);
+      if (proxyService != null)
+        proxyService.setEmptyIcon(hideIcon);
+    }
     super.onSharedPreferenceChanged(sharedPreferences, key);
   }
 
   private void showConfigurationMsg(String message)
   {
     TextView msg = (TextView) findViewById(R.id.txt_configuration);
     msg.setText(message);
     msg.setVisibility(View.VISIBLE);
   }
 
@@ skipping 92 matching lines @@
       }
       subscriptionSummary = builder.toString();
       subscriptionList.setSummary(subscriptionSummary);
     }
   }
 
   @Override
   protected void onRestoreInstanceState(Bundle state)
   {
     super.onRestoreInstanceState(state);
-    showAbout = state.getBoolean("showAbout");
     trafficDetected = state.getBoolean("trafficDetected");
     subscriptionSummary = state.getString("subscriptionSummary");
   }
 
   @Override
   protected void onSaveInstanceState(Bundle outState)
   {
     outState.putString("subscriptionSummary", subscriptionSummary);
     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())
           showConfigurationMsg(getString(R.string.msg_configuration, proxyService.port));
     }
 
     public void onServiceDisconnected(ComponentName className)
     {
       proxyService = null;
       Log.d(TAG, "Proxy service disconnected");
     }
   };
 }