Dedicated class for grabbing context in python

python-for-android/dists/kolibri/src/main/java/org/kivy/android/PythonContext.java

@@ -0,0 +1,33 @@
+package org.kivy.android;
+
+import android.content.Context;
+
+public class PythonContext {
+    public static PythonContext mInstance;
+
+    private final Context context;
+
+    private PythonContext(Context context) {
+        this.context = context;
+    }
+
+    public static PythonContext getInstance(Context context) {
+        if (mInstance == null) {
+            synchronized (PythonContext.class) {
+                if (mInstance == null) {
+                    mInstance = new PythonContext(
+                            context.getApplicationContext()
+                    );
+                }
+            }
+        }
+        return PythonContext.mInstance;
+    }
+
+    public static Context get() {
+        if (PythonContext.mInstance == null) {
+            return null;
+        }
+        return PythonContext.mInstance.context;
+    }
+}

python-for-android/dists/kolibri/src/main/java/org/kivy/android/PythonWorker.java

@@ -6,6 +6,9 @@
 
 import androidx.annotation.NonNull;
 
+/**
+ * Ideally this would be called `PythonWorkerImpl` but the name is used in the native code.
+ */
 public class PythonWorker {
     private static final String TAG = "PythonWorkerImpl";
     // Python environment variables

python-for-android/dists/kolibri/src/main/java/org/learningequality/Kolibri/App.java

@@ -11,6 +11,7 @@
 import androidx.core.app.NotificationManagerCompat;
 import androidx.work.Configuration;
 
+import org.kivy.android.PythonContext;
 import org.learningequality.notification.NotificationRef;
 
 import java.util.concurrent.Executors;
@@ -23,6 +24,8 @@ public class App extends Application implements Configuration.Provider {
     @Override
     public void onCreate() {
         super.onCreate();
+        // Initialize Python context
+        PythonContext.getInstance(this);
         createNotificationChannels();
         // Register activity lifecycle callbacks
         registerActivityLifecycleCallbacks(new KolibriActivityLifecycleCallbacks());

src/android_utils.py

@@ -49,8 +49,8 @@ def get_version_name():
 
 @cache
 def get_context():
-    ContextUtil = autoclass("org.learningequality.ContextUtil")
-    return ContextUtil.getApplicationContext()
+    PythonContext = autoclass("org.kivy.android.PythonContext")
+    return PythonContext.get();
 
 
 @cache