android: notification icon option

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 22 matching lines @@
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.Resources;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Binder;
 import android.os.Build;
 import android.os.Handler;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
 import android.util.Log;
 import android.widget.Toast;
 
@@ skipping 55 matching lines @@
 
   private String iptables = null;
 
   @Override
   public void onCreate()
   {
     super.onCreate();
 
     // Get port for local proxy
     SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+    Resources resources = getResources();
+    
     String p = prefs.getString(getString(R.string.pref_port), null);
     try
     {
-      port = p != null ? Integer.valueOf(p) : getResources().getInteger(R.integer.def_port);
+      port = p != null ? Integer.valueOf(p) : resources.getInteger(R.integer.def_port);
     }
     catch (NumberFormatException e)
     {
       Toast.makeText(this, getString(R.string.msg_badport) + ": " + p, Toast.LENGTH_LONG).show();
-      port = getResources().getInteger(R.integer.def_port);
+      port = resources.getInteger(R.integer.def_port);
     }
 
     // Try to read user proxy settings
     String proxyHost = null;
     String proxyPort = null;
     String proxyExcl = null;
     String proxyUser = null;
     String proxyPass = null;
 
     if (hasNativeProxy)
@@ skipping 118 matching lines @@
     prefs.registerOnSharedPreferenceChangeListener(this);
 
     String msg = getString(transparent ? R.string.notif_all : nativeProxy ? R.string.notif_wifi : R.string.notif_waiting);
     if (!transparent && !nativeProxy)
     {
       // Initiate no traffic check
       notrafficHandler = new Handler();
       notrafficHandler.postDelayed(noTraffic, NO_TRAFFIC_TIMEOUT);
     }
     // Lock service
+    boolean hideIcon = prefs.getBoolean(getString(R.string.pref_hideicon), resources.getBoolean(R.bool.def_hideicon));
     ongoingNotification = new Notification();
     ongoingNotification.when = 0;
     contentIntent = PendingIntent.getActivity(this, 0, new Intent(this, Preferences.class).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK), 0);
-    ongoingNotification.icon = R.drawable.ic_stat_blocking;
+    ongoingNotification.icon = hideIcon ? R.drawable.transparent : R.drawable.ic_stat_blocking;
     ongoingNotification.setLatestEventInfo(getApplicationContext(), getText(R.string.app_name), msg, contentIntent);
     startForeground(ONGOING_NOTIFICATION_ID, ongoingNotification);
 
     sendBroadcast(new Intent(BROADCAST_STATE_CHANGED).putExtra("enabled", true).putExtra("port", port).putExtra("manual", isManual()));
     Log.i(TAG, "Service started");
   }
 
   @Override
   public int onStartCommand(Intent intent, int flags, int startId)
   {
@@ skipping 303 matching lines @@
       notrafficHandler.removeCallbacks(noTraffic);
       if (changeStatus)
       {
         NotificationManager notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
         ongoingNotification.setLatestEventInfo(ProxyService.this, getText(R.string.app_name), getText(R.string.notif_wifi), contentIntent);
         notificationManager.notify(ONGOING_NOTIFICATION_ID, ongoingNotification);
       }
     }
     notrafficHandler = null;
   }
+  
+  public void setEmptyIcon(boolean empty)
+  {
+    ongoingNotification.icon = empty ? R.drawable.transparent : R.drawable.ic_stat_blocking;
+    NotificationManager notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);    
+    notificationManager.notify(ONGOING_NOTIFICATION_ID, ongoingNotification);
+  }
 
   private final IBinder binder = new LocalBinder();
 
   public final class LocalBinder extends Binder
   {
     public ProxyService getService()
     {
       return ProxyService.this;
     }
   }
@@ skipping 126 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);
       }
     }
   }
 }