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 54 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);
     }
 
     // Try to read user proxy settings
     String proxyHost = null;
     String proxyPort = null;
@@ skipping 123 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
+    // Prepare notification
     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.setLatestEventInfo(getApplicationContext(), getText(R.string.app_name), msg, contentIntent);
 
+    // Lock service
+    if (prefs.getBoolean(getString(R.string.pref_priority), resources.getBoolean(R.bool.def_priority)))
+    {
+      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)
+  {
+    return START_STICKY;
+  }
+
+  @Override
   public void onDestroy()
   {
     super.onDestroy();
 
     stopNoTrafficCheck(false);
 
     unregisterReceiver(matchesReceiver);
     unregisterReceiver(proxyReceiver);
 
     // Stop IP redirecting
@@ skipping 24 matching lines @@
 
     sendBroadcast(new Intent(BROADCAST_STATE_CHANGED).putExtra("enabled", false));
 
     // Stop proxy server
     if (proxy != null)
       proxy.close();
 
     // Stop engine if not in interactive mode
     AdblockPlus.getApplication().stopEngine(false);
 
+    // Release service lock
+    stopForeground(true);
+
     Log.i(TAG, "Service stopped");
   }
 
   /**
    * Restores system proxy settings via native call on Android 3.1+ devices using
    * Java reflection.
    */
   private void clearConnectionProxy()
   {
     String proxyHost = (String) proxy.props.getProperty("adblock.proxyHost");
@@ skipping 89 matching lines @@
     }
     catch (ClassCastException e)
     {
       // ignore - default handler in use
     }
   }
 
   @Override
   public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key)
   {
+    if (getString(R.string.pref_priority).equals(key))
+    {
+      if (sharedPreferences.getBoolean(key, false))
+      {
+        startForeground(ONGOING_NOTIFICATION_ID, ongoingNotification);
+      }
+      else
+      {
+        stopForeground(true);
+      }
+      return;
+    }
     if (hasNativeProxy)
     {
       String ketHost = getString(R.string.pref_proxyhost);
       String keyPort = getString(R.string.pref_proxyport);
       String keyUser = getString(R.string.pref_proxyuser);
       String keyPass = getString(R.string.pref_proxypass);
       if (key.equals(ketHost) || key.equals(keyPort) || key.equals(keyUser) || key.equals(keyPass))
       {
         String proxyHost = sharedPreferences.getString(ketHost, null);
         String proxyPort = sharedPreferences.getString(keyPort, null);
@@ skipping 279 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);
       }
     }
   }
 }