Fix lingering notifications spam

learningequality · Jan 16, 2024 · dfee793 · dfee793
1 parent 4ce4a69
commit dfee793
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/python-for-android/dists/kolibri/src/main/java/org/kivy/android/PythonWorker.java b/python-for-android/dists/kolibri/src/main/java/org/kivy/android/PythonWorker.java
@@ -22,8 +22,7 @@ public class PythonWorker {
     private final String pythonPath;
 
     public PythonWorker(@NonNull Context context, String pythonName, String workerEntrypoint) {
-//        PythonLoader.doLoad(context);
-        PythonUtil.loadLibraries(new File(context.getApplicationInfo().nativeLibraryDir));
+        PythonLoader.doLoad(context);
         this.pythonName = pythonName;
         this.workerEntrypoint = workerEntrypoint;
 

diff --git a/...or-android/dists/kolibri/src/main/java/org/learningequality/Kolibri/BackgroundWorker.java b/...or-android/dists/kolibri/src/main/java/org/learningequality/Kolibri/BackgroundWorker.java
@@ -34,12 +34,14 @@ public Result doWork() {
         Log.d(TAG, "Running background task " + getId());
         final String id = getId().toString();
         final String arg = getArgument();
-        return workerImpl.execute(id, arg) ? Result.success() : Result.failure();
+        Result r =  workerImpl.execute(id, arg) ? Result.success() : Result.failure();
+        hideNotification();
+        return r;
     }
 
     @Override
     public void onStopped() {
-        Log.d(TAG, "Stopping foreground remote task " + getId());
+        Log.d(TAG, "Stopping background remote task " + getId());
         super.onStopped();
         hideNotification();
     }

diff --git a/...or-android/dists/kolibri/src/main/java/org/learningequality/Kolibri/ForegroundWorker.java b/...or-android/dists/kolibri/src/main/java/org/learningequality/Kolibri/ForegroundWorker.java
@@ -68,6 +68,10 @@ public ListenableFuture<Result> startRemoteWork() {
                         threadFuture.cancel(true);
                     }
                 }
+
+                if (future.isDone()) {
+                    hideNotification();
+                }
             }
         }, getTaskExecutor().getMainThreadExecutor());
         return future;

diff --git a/...n-for-android/dists/kolibri/src/main/java/org/learningequality/Kolibri/WorkerService.java b/...n-for-android/dists/kolibri/src/main/java/org/learningequality/Kolibri/WorkerService.java
@@ -22,9 +22,6 @@ public class WorkerService extends RemoteWorkerService implements Notifier {
     public void onCreate() {
         Log.d(TAG, "Initializing foreground worker service");
         super.onCreate();
-        // We could potentially remove this and leave the notification up to long-running workers
-        // bound to the service
-        sendNotification();
         mService = this;
     }