Ensure that notification id is always read from thread local state, t…

…o prevent mixups.

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

@@ -35,8 +35,6 @@ public class PythonWorker extends RemoteListenableWorker {
 
     public static PythonWorker mWorker = null;
 
-    public int notificationId;
-
     public static ThreadLocal<Integer> threadNotificationId = new ThreadLocal<>();
 
     private String notificationTitle;
@@ -50,7 +48,7 @@ public PythonWorker(
 
         notificationTitle = context.getString(R.string.app_name);
 
-        notificationId = ThreadLocalRandom.current().nextInt(1, 65537);
+        threadNotificationId.set(ThreadLocalRandom.current().nextInt(1, 65537));
 
         PythonWorker.mWorker = this;
 
@@ -86,6 +84,8 @@ public ListenableFuture<Result> startRemoteWork() {
                 runAsForeground();
             }
 
+            int notificationId = getNotificationId();
+
             // The python thread handling the work needs to be run in a
             // separate thread so that future can be returned. Without
             // it, any cancellation can't be processed.
@@ -138,7 +138,7 @@ public static native int nativeStart(
     );
 
     public ForegroundInfo getForegroundInfo() {
-        return new ForegroundInfo(notificationId, Notifications.createNotification(notificationTitle, null, -1, -1));
+        return new ForegroundInfo(getNotificationId(), Notifications.createNotification(notificationTitle, null, -1, -1));
     }
 
     public void runAsForeground() {