service binder interface

brussee · brussee · commit f0a35d6a7534 · 2016-07-29T17:26:04.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
@@ -31,13 +31,18 @@ public class PythonService extends Service implements Runnable {
     private String serviceEntrypoint;
     private String pythonServiceArgument;
 
-    protected boolean autoRestartService = false;
-    protected boolean startForeground = true;
-
-    public int startType() {
+    public int getStartType() {
         return START_NOT_STICKY;
     }
 
+    public boolean getStartForeground() {
+        return false;
+    }
+
+    public boolean getAutoRestart() {
+        return false;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -81,11 +86,11 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         pythonThread = new Thread(this);
         pythonThread.start();
 
-        if (startForeground) {
+        if (getStartForeground()) {
             doStartForeground(extras);
         }
 
-        return startType();
+        return getStartType();
     }
 
     protected void doStartForeground(Bundle extras) {
@@ -118,7 +123,7 @@ protected void doStartForeground(Bundle extras) {
     public void onDestroy() {
         super.onDestroy();
         pythonThread = null;
-        if (autoRestartService && startIntent != null) {
+        if (getAutoRestart() && startIntent != null) {
             Log.v(TAG, "Service restart requested");
             startService(startIntent);
         }
@@ -131,8 +136,8 @@ public void onDestroy() {
     @Override
     public void run() {
         PythonUtil.loadLibraries(getFilesDir());
-        nativeStart(androidPrivate, androidArgument, serviceEntrypoint,
-                pythonName, pythonHome, pythonPath, pythonServiceArgument);
+        nativeStart(androidPrivate, androidArgument, serviceEntrypoint, pythonName, pythonHome,
+                pythonPath, pythonServiceArgument);
         stopSelf();
     }
 
@@ -145,8 +150,8 @@ public void run() {
      * @param pythonPath            Python path
      * @param pythonServiceArgument Argument to pass to Python code
      */
-    public static native void nativeStart(String androidPrivate,
-                                          String androidArgument, String serviceEntrypoint,
-                                          String pythonName, String pythonHome, String pythonPath,
+    public static native void nativeStart(String androidPrivate, String androidArgument,
+                                          String serviceEntrypoint, String pythonName,
+                                          String pythonHome, String pythonPath,
                                           String pythonServiceArgument);
 }
diff --git a/pythonforandroid/bootstraps/service_only/build/templates/Service.tmpl.java b/pythonforandroid/bootstraps/service_only/build/templates/Service.tmpl.java
@@ -4,14 +4,18 @@
 import android.content.Context;
 import org.kivy.android.PythonService;
 
-
 public class Service{{ name|capitalize }} extends PythonService {
+	/**
+	 * Binder given to clients
+	 */
+    private final IBinder mBinder = new LocalBinder();
+
     {% if sticky %}
     /**
      * {@inheritDoc}
      */
     @Override
-    public int startType() {
+    public int getStartType() {
         return START_STICKY;
     }
     {% endif %}
@@ -21,7 +25,7 @@ public int startType() {
      * {@inheritDoc}
      */
     @Override
-    public boolean canDisplayNotification() {
+    public boolean getStartForeground() {
         return false;
     }
     {% endif %}
@@ -46,4 +50,22 @@ public static void stop(Context ctx) {
         ctx.stopService(intent);
     }
 
+    /**
+     * Class used for the client Binder. Because we know this service always
+     * runs in the same process as its clients, we don't need to deal with IPC.
+     */
+    public class Service{{ name|capitalize }}Binder extends Binder {
+    	Service{{ name|capitalize }} getService() {
+            // Return this instance of Service{{ name|capitalize }} so clients can call public methods
+            return Service{{ name|capitalize }}.this;
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mBinder;
+    }
 }
