Expose current worker in order to access context.

Rename work manager argument environment variable.

Author: rtibbles

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

@@ -22,8 +22,8 @@
 public class PythonWorker extends RemoteListenableWorker {
     private static final String TAG = "PythonWorker";
 
-    // WorkRequest data key for python service argument
-    public static final String ARGUMENT_SERVICE_ARGUMENT = "PYTHON_SERVICE_ARGUMENT";
+    // WorkRequest data key for python worker argument
+    public static final String ARGUMENT_WORKER_ARGUMENT = "PYTHON_WORKER_ARGUMENT";
 
     // Python environment variables
     private String androidPrivate;
@@ -33,13 +33,17 @@ public class PythonWorker extends RemoteListenableWorker {
     private String pythonPath;
     private String workerEntrypoint;
 
+    public static PythonWorker mWorker = null;
+
     public PythonWorker(
         @NonNull Context context,
         @NonNull WorkerParameters params) {
         super(context, params);
 
         String appRoot = PythonUtil.getAppRoot(context);
 
+        PythonWorker.mWorker = this;
+
         androidPrivate = appRoot;
         androidArgument = appRoot;
         pythonHome = appRoot;
@@ -64,7 +68,7 @@ public void setWorkerEntrypoint(String value) {
     @Override
     public ListenableFuture<Result> startRemoteWork() {
         return CallbackToFutureAdapter.getFuture(completer -> {
-            String dataArg = getInputData().getString(ARGUMENT_SERVICE_ARGUMENT);
+            String dataArg = getInputData().getString(ARGUMENT_WORKER_ARGUMENT);
             final String serviceArg;
             if (dataArg != null) {
                 Log.d(TAG, "Setting python service argument to " + dataArg);

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

@@ -24,10 +24,10 @@ public class {{ name|capitalize }}Worker extends PythonWorker {
         mWorker = this;
     }
 
-    public static Data buildInputData (String serviceArgument) {
-        String dataArgument = serviceArgument == null ? "" : serviceArgument;
+    public static Data buildInputData (String workerArgument) {
+        String dataArgument = workerArgument == null ? "" : workerArgument;
         Data data = new Data.Builder()
-            .putString(ARGUMENT_SERVICE_ARGUMENT, dataArgument)
+            .putString(ARGUMENT_WORKER_ARGUMENT, dataArgument)
             .putString(ARGUMENT_PACKAGE_NAME, "{{ args.package }}")
             .putString(ARGUMENT_CLASS_NAME,
                        {{ name|capitalize }}WorkerService.class.getName())
@@ -38,8 +38,8 @@ public static Data buildInputData (String serviceArgument) {
 
     public static WorkRequest buildWorkRequest (
         WorkRequest.Builder builder,
-        String serviceArgument) {
-        Data data = buildInputData(serviceArgument);
+        String workerArgument) {
+        Data data = buildInputData(workerArgument);
         return builder.setInputData(data).build();
     }
 }