services: fix START_STICKY

pythonforandroid/bootstraps/common/build/src/main/java/org/kivy/android/PythonService.java

@@ -25,14 +25,14 @@ public class PythonService extends Service implements Runnable {
     private Thread pythonThread = null;
 
     // Python environment variables
-    private String androidPrivate;
-    private String androidArgument;
-    private String pythonName;
-    private String pythonHome;
-    private String pythonPath;
-    private String serviceEntrypoint;
+    protected String androidPrivate;
+    protected String androidArgument;
+    protected String pythonName;
+    protected String pythonHome;
+    protected String pythonPath;
+    protected String serviceEntrypoint;
     // Argument to pass to Python code,
-    private String pythonServiceArgument;
+    protected String pythonServiceArgument;
 
 
     public static PythonService mService = null;
@@ -60,28 +60,36 @@ public void onCreate() {
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
+	startIntent = intent;
         if (pythonThread != null) {
             Log.v("python service", "service exists, do not start again");
-            return START_NOT_STICKY;
+            return startType();
         }
+        //when app is closed, OS will restart the service with null intent See #2401
+        if (intent != null) {
+
+            Bundle extras = intent.getExtras();
+            androidPrivate = extras.getString("androidPrivate");
+            androidArgument = extras.getString("androidArgument");
+            serviceEntrypoint = extras.getString("serviceEntrypoint");
+            pythonName = extras.getString("pythonName");
+            pythonHome = extras.getString("pythonHome");
+            pythonPath = extras.getString("pythonPath");
+            boolean serviceStartAsForeground = false;
+            String foreground = extras.getString("serviceStartAsForeground");
+            if (foreground != null) {
+                serviceStartAsForeground = foreground.equals("true");
+            }
+            pythonServiceArgument = extras.getString("pythonServiceArgument");
+            pythonThread = new Thread(this);
+            pythonThread.start();
 
-		startIntent = intent;
-        Bundle extras = intent.getExtras();
-        androidPrivate = extras.getString("androidPrivate");
-        androidArgument = extras.getString("androidArgument");
-        serviceEntrypoint = extras.getString("serviceEntrypoint");
-        pythonName = extras.getString("pythonName");
-        pythonHome = extras.getString("pythonHome");
-        pythonPath = extras.getString("pythonPath");
-        boolean serviceStartAsForeground = (
-            extras.getString("serviceStartAsForeground").equals("true")
-        );
-        pythonServiceArgument = extras.getString("pythonServiceArgument");
-        pythonThread = new Thread(this);
-        pythonThread.start();
-
-        if (serviceStartAsForeground) {
-            doStartForeground(extras);
+            if (serviceStartAsForeground) {
+                doStartForeground(extras);
+            }
+        } else {
+            pythonThread = new Thread(this);
+            pythonThread.start();
         }
 
         return startType();
@@ -153,7 +161,9 @@ public void onDestroy() {
     @Override
     public void onTaskRemoved(Intent rootIntent) {
         super.onTaskRemoved(rootIntent);
-        stopSelf();
+        if (startType() == START_NOT_STICKY) {
+            stopSelf();
+        }
     }
 
     @Override

pythonforandroid/bootstraps/common/build/templates/Service.tmpl.java

@@ -3,6 +3,7 @@
 import android.content.Intent;
 import android.content.Context;
 import org.kivy.android.PythonService;
+import java.io.File;
 
 
 public class Service{{ name|capitalize }} extends PythonService {
@@ -34,6 +35,35 @@ static public void start(Context ctx, String pythonServiceArgument) {
         ctx.startService(intent);
     }
 
+    @Override
+    public void run(){
+        String package_root = getFilesDir().getAbsolutePath();
+        String app_root =  package_root + "/app";
+        File app_root_file = new File(app_root);
+        if (androidPrivate == null) {
+            androidPrivate = package_root;
+        }
+        if (androidArgument == null) {
+            androidArgument = app_root;
+        }
+        if (serviceEntrypoint == null) {
+            serviceEntrypoint ="{{ entrypoint }}";
+        }
+        if (pythonName == null) {
+            pythonName = "{{ name }}";
+        }
+        if (pythonHome == null) {
+            pythonHome = app_root;
+        }
+        if (pythonPath == null) {
+            pythonPath = package_root;
+        }
+        if (pythonServiceArgument == null) {
+            pythonServiceArgument = app_root+":"+app_root+"/lib";
+        }
+        super.run();
+    }
+
     static public void stop(Context ctx) {
         Intent intent = new Intent(ctx, Service{{ name|capitalize }}.class);
         ctx.stopService(intent);