Cleanup and preparation for worker context reading.

src/android_utils.py

@@ -12,6 +12,18 @@ def is_service_context():
     return "PYTHON_SERVICE_ARGUMENT" in os.environ
 
 
+def is_worker_context():
+    return "PYTHON_WORKER_ARGUMENT" in os.environ
+
+
+def get_worker():
+    assert (
+        is_worker_context()
+    ), "Cannot get a worker, as we are not in a worker context."
+    PythonWorker = autoclass("org.kivy.android.PythonWorker")
+    return PythonWorker.mWorker
+
+
 def get_service():
     assert (
         is_service_context()
@@ -57,6 +69,8 @@ def get_activity():
     if ACTIVITY is None:
         if is_service_context():
             ACTIVITY = cast("android.app.Service", get_service())
+        elif is_worker_context():
+            ACTIVITY = cast("androidx.work.Worker", get_worker())
         else:
             PythonActivity = autoclass("org.kivy.android.PythonActivity")
             ACTIVITY = PythonActivity.mActivity

src/kolibri_tasks.py

@@ -1,23 +1,13 @@
 from datetime import datetime
 from datetime import timedelta
 
-from android_utils import PythonActivity
+from android_utils import get_activity
 from jnius import autoclass
 
 
-WorkManager = autoclass("androidx.work.WorkManager")
-OneTimeWorkRequestBuilder = autoclass("androidx.work.OneTimeWorkRequest$Builder")
-PeriodicWorkRequestBuilder = autoclass("androidx.work.PeriodicWorkRequest$Builder")
-BackoffPolicy = autoclass("androidx.work.BackoffPolicy")
-ExistingWorkPolicy = autoclass("androidx.work.ExistingWorkPolicy")
-ExistingPeriodicWorkPolicy = autoclass("androidx.work.ExistingPeriodicWorkPolicy")
-TimeUnit = autoclass("java.util.concurrent$TimeUnit")
-
-TaskWorker = autoclass("org.learningequality.Kolibri.TaskWorker")
-
-
 def get_work_manager():
-    return WorkManager.getInstance(PythonActivity.mActivity)
+    WorkManager = autoclass("androidx.work.WorkManager")
+    return WorkManager.getInstance(get_activity().mActivity)
 
 
 def queue_task(
@@ -30,6 +20,20 @@ def queue_task(
     keep=True,
 ):
     if id:
+        OneTimeWorkRequestBuilder = autoclass(
+            "androidx.work.OneTimeWorkRequest$Builder"
+        )
+        PeriodicWorkRequestBuilder = autoclass(
+            "androidx.work.PeriodicWorkRequest$Builder"
+        )
+        BackoffPolicy = autoclass("androidx.work.BackoffPolicy")
+        ExistingWorkPolicy = autoclass("androidx.work.ExistingWorkPolicy")
+        ExistingPeriodicWorkPolicy = autoclass(
+            "androidx.work.ExistingPeriodicWorkPolicy"
+        )
+        TimeUnit = autoclass("java.util.concurrent.TimeUnit")
+
+        TaskWorker = autoclass("org.learningequality.Kolibri.TaskworkerWorker")
         id = str(id)
         data = TaskWorker.buildInputData(id)
 

src/main.py

@@ -34,7 +34,6 @@ def SERVING(self, port):
             "http://127.0.0.1:{port}".format(port=port) + interface.get_initialize_url()
         )
         loadUrl(start_url)
-        start_service("workers")
 
 
 logging.info("Initializing Kolibri and running any upgrade routines")