change service icon option

brussee · brussee · commit b76fe2219705 · 2016-07-22T21:13:00.000+02:00
diff --git a/pythonforandroid/bootstraps/service_only/build/src/org/kivy/android/PythonService.java b/pythonforandroid/bootstraps/service_only/build/src/org/kivy/android/PythonService.java
@@ -5,6 +5,7 @@
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ApplicationInfo;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.Process;
@@ -14,7 +15,6 @@
 public class PythonService extends Service implements Runnable {
     private static String TAG = PythonService.class.getSimpleName();
 
-    public static PythonService mService = null;
     /**
      * Intent that started the service
      */
@@ -31,15 +31,8 @@ public class PythonService extends Service implements Runnable {
     private String serviceEntrypoint;
     private String pythonServiceArgument;
 
-    private boolean autoRestartService = false;
-
-    public void setAutoRestartService(boolean restart) {
-        autoRestartService = restart;
-    }
-
-    public boolean canDisplayNotification() {
-        return true;
-    }
+    protected boolean autoRestartService = false;
+    protected boolean startForeground = true;
 
     public int startType() {
         return START_NOT_STICKY;
@@ -88,22 +81,24 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         pythonThread = new Thread(this);
         pythonThread.start();
 
-        if (canDisplayNotification()) {
+        if (startForeground) {
             doStartForeground(extras);
         }
 
         return startType();
     }
 
     protected void doStartForeground(Bundle extras) {
-        String serviceTitle = extras.getString("serviceTitle");
-        String serviceDescription = extras.getString("serviceDescription");
+        Context appContext = getApplicationContext();
+        ApplicationInfo appInfo = appContext.getApplicationInfo();
 
-        Context context = getApplicationContext();
+        String serviceTitle = extras.getString("serviceTitle", TAG);
+        String serviceDescription = extras.getString("serviceDescription", "");
+        int serviceIconId = extras.getInt("serviceIconId", appInfo.icon);
 
         NotificationCompat.Builder builder =
                 new NotificationCompat.Builder(this)
-                        .setSmallIcon(context.getApplicationInfo().icon)
+                        .setSmallIcon(serviceIconId)
                         .setContentTitle(serviceTitle)
                         .setContentText(serviceDescription);
 
@@ -136,7 +131,6 @@ public void onDestroy() {
     @Override
     public void run() {
         PythonUtil.loadLibraries(getFilesDir());
-        mService = this;
         nativeStart(androidPrivate, androidArgument, serviceEntrypoint,
                 pythonName, pythonHome, pythonPath, pythonServiceArgument);
         stopSelf();
