cleanup

Author: mzakharo

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
-    public String androidPrivate;
-    public String androidArgument;
-    public String pythonName;
-    public String pythonHome;
-    public String pythonPath;
-    public 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,
-    public String pythonServiceArgument;
+    protected String pythonServiceArgument;
 
 
     public static PythonService mService = null;
@@ -65,6 +65,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             Log.v("python service", "service exists, do not start again");
             return startType();
         }
+        //when app is closed, OS will restart the service with null intent See #2401
         if (intent != null) {
 
             Bundle extras = intent.getExtras();

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

@@ -3,7 +3,6 @@
 import android.content.Intent;
 import android.content.Context;
 import org.kivy.android.PythonService;
-import org.kivy.android.PythonUtil;
 import java.io.File;
 
 
@@ -41,10 +40,6 @@ public void run(){
         String package_root = getFilesDir().getAbsolutePath();
         String app_root =  package_root + "/app";
         File app_root_file = new File(app_root);
-        PythonUtil.loadLibraries(app_root_file,
-            new File(getApplicationInfo().nativeLibraryDir));
-        this.mService = this;
-
         if (androidPrivate == null) {
             androidPrivate = package_root;
         }
@@ -66,12 +61,7 @@ public void run(){
         if (pythonServiceArgument == null) {
             pythonServiceArgument = app_root+":"+app_root+"/lib";
         }
-        nativeStart(
-            androidPrivate, androidArgument,
-            serviceEntrypoint, pythonName,
-            pythonHome, pythonPath,
-            pythonServiceArgument);
-        stopSelf();
+        super.run();
     }
 
     static public void stop(Context ctx) {