Merge pull request #1586 from opacam/minor-fix-bootstraps

Corrections for `Fix bootstraps for webview and service_only` (recently merged)

Author: AndreMiras

pythonforandroid/bootstraps/common/build/build.py

@@ -336,9 +336,11 @@ def make_package(args):
         with open(args.intent_filters) as fd:
             args.intent_filters = fd.read()
 
-    # if get_bootstrap_name() == "sdl2":
-    args.add_activity = args.add_activity or []
-    args.activity_launch_mode = args.activity_launch_mode or ''
+    if not args.add_activity:
+        args.add_activity = []
+
+    if not args.activity_launch_mode:
+        args.activity_launch_mode = ''
 
     if args.extra_source_dirs:
         esd = []
@@ -536,6 +538,9 @@ def parse_args(args=None):
     ap.add_argument('--icon', dest='icon',
                     help=('A png file to use as the icon for '
                           'the application.'))
+    ap.add_argument('--service', dest='services', action='append',
+                    help='Declare a new service entrypoint: '
+                         'NAME:PATH_TO_PY[:foreground]')
     if get_bootstrap_name() != "service_only":
         ap.add_argument('--presplash', dest='presplash',
                         help=('A jpeg file to use as a screen while the '
@@ -564,10 +569,6 @@ def parse_args(args=None):
                               'https://developer.android.com/guide/'
                               'topics/manifest/'
                               'activity-element.html'))
-    else:
-        ap.add_argument('--service', dest='services', action='append',
-                        help='Declare a new service entrypoint: '
-                             'NAME:PATH_TO_PY[:foreground]')
     ap.add_argument('--wakelock', dest='wakelock', action='store_true',
                     help=('Indicate if the application needs the device '
                           'to stay on'))
@@ -687,7 +688,7 @@ def _read_configuration():
     if args.meta_data is None:
         args.meta_data = []
 
-    if (not hasattr(args, 'services')) or args.services is None:
+    if args.services is None:
         args.services = []
 
     if args.try_system_python_compile:

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

@@ -1,5 +1,7 @@
 package {{ args.package }};
 
+import android.os.Binder;
+import android.os.IBinder;
 import android.content.Intent;
 import android.content.Context;
 import org.kivy.android.PythonService;
@@ -31,7 +33,7 @@ public boolean getStartForeground() {
     {% endif %}
 
     public static void start(Context ctx, String pythonServiceArgument) {
-    	String argument = ctx.getFilesDir().getAbsolutePath();
+        String argument = ctx.getFilesDir().getAbsolutePath() + "/app";
         Intent intent = new Intent(ctx, Service{{ name|capitalize }}.class);
         intent.putExtra("androidPrivate", argument);
         intent.putExtra("androidArgument", argument);
@@ -45,7 +47,7 @@ public static void start(Context ctx, String pythonServiceArgument) {
         intent.putExtra("pythonServiceArgument", pythonServiceArgument);
         ctx.startService(intent);
     }
-    
+
     public static void stop(Context ctx) {
         Intent intent = new Intent(ctx, Service{{ name|capitalize }}.class);
         ctx.stopService(intent);
@@ -58,7 +60,7 @@ public static void stop(Context ctx) {
     public IBinder onBind(Intent intent) {
         return mBinder;
     }
-    
+
     /**
      * 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.

testapps/setup_testapp_service.py

@@ -3,7 +3,7 @@
 from setuptools import find_packages
 
 options = {'apk': {'debug': None,
-                   'requirements': 'python2,genericndkbuild',
+                   'requirements': 'python2,genericndkbuild,pyjnius',
                    'android-api': 27,
                    'ndk-api': 21,
                    'ndk-dir': '/home/asandy/android/crystax-ndk-10.3.2',
@@ -12,6 +12,7 @@
                    'bootstrap': 'service_only',
                    'permissions': ['INTERNET', 'VIBRATE'],
                    'arch': 'armeabi-v7a',
+                   'service': 'time:p4atime.py',
                    }}
 
 package_data = {'': ['*.py']}
@@ -21,7 +22,7 @@
 
 setup(
     name='testapp_service',
-    version='1.0',
+    version='1.1',
     description='p4a service testapp',
     author='Alexander Taylor',
     author_email='[email protected]',

testapps/testapp_service/main.py

@@ -1,4 +1,4 @@
-print('main.py was successfully called')
+print('Service Test App main.py was successfully called')
 
 import sys
 print('python version is: ', sys.version)
@@ -11,17 +11,9 @@
     print(i, sqrt(i))
 
 print('Just printing stuff apparently worked, trying a simple service')
-import datetime, threading, time
 
-next_call = time.time()
-
-
-def service_timer():
-    global next_call
-    print('P4a datetime service: {}'.format(datetime.datetime.now()))
-    next_call = next_call + 1
-    threading.Timer(next_call - time.time(), service_timer).start()
-
-
-print('Starting the service timer...')
-service_timer()
+from jnius import autoclass
+service = autoclass('org.test.testapp_service.ServiceTime')
+mActivity = autoclass('org.kivy.android.PythonActivity').mActivity
+argument = 'test argument ok'
+service.start(mActivity, argument)

testapps/testapp_service/p4atime.py

@@ -0,0 +1,19 @@
+import datetime
+import threading
+import time
+from os import environ
+argument = environ.get('PYTHON_SERVICE_ARGUMENT', '')
+print('p4atime.py was successfully called with argument: "{}"'.format(argument))
+
+next_call = time.time()
+
+
+def service_timer():
+    global next_call
+    print('P4a datetime service: {}'.format(datetime.datetime.now()))
+    next_call = next_call + 1
+    threading.Timer(next_call - time.time(), service_timer).start()
+
+
+print('Starting the service timer...')
+service_timer()