expo-task-manager 11.8.1 → 11.8.2

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 11.8.2 — 2024-05-29
+
+### 🐛 Bug fixes
+
+- [Android] Fix the task manager events not being sent to the JS side. ([#29024](https://github.com/expo/expo/pull/29024) by [@behenate](https://github.com/behenate))
+
 ## 11.8.1 — 2024-04-23
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '11.8.1'
+version = '11.8.2'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -14,7 +14,7 @@ android {
   namespace "expo.modules.taskManager"
   defaultConfig {
     versionCode 23
-    versionName "11.8.1"
+    versionName "11.8.2"
   }
 }
 

package/android/src/main/java/expo/modules/taskManager/EmitEventWrapper.java

@@ -0,0 +1,9 @@
+package expo.modules.taskManager;
+
+import android.os.Bundle;
+
+// Wrapper used for passing the emit function from the EventEmitter between Kotlin and Java
+@FunctionalInterface
+interface EmitEventWrapper {
+  void emit(String name, Bundle body);
+}

package/android/src/main/java/expo/modules/taskManager/TaskManagerInternalModule.java

@@ -2,11 +2,11 @@ package expo.modules.taskManager;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.util.Log;
 
 import expo.modules.core.ModuleRegistry;
 import expo.modules.core.interfaces.InternalModule;
 import expo.modules.core.interfaces.LifecycleEventListener;
-import expo.modules.core.interfaces.services.EventEmitter;
 import expo.modules.core.interfaces.services.UIManager;
 
 import java.lang.ref.WeakReference;
@@ -22,11 +22,11 @@ import expo.modules.interfaces.taskManager.TaskServiceInterface;
 
 public class TaskManagerInternalModule implements InternalModule, TaskManagerInterface, LifecycleEventListener {
   private UIManager mUIManager;
-  private EventEmitter mEventEmitter;
   private ConstantsInterface mConstants;
   private TaskServiceInterface mTaskService;
   private WeakReference<Context> mContextRef;
   private List<Bundle> mEventsQueue = new ArrayList<>();
+  private EmitEventWrapper mEmitEventWrapper;
 
   public TaskManagerInternalModule(Context context) {
     mContextRef = new WeakReference<>(context);
@@ -39,13 +39,16 @@ public class TaskManagerInternalModule implements InternalModule, TaskManagerInt
     return Collections.singletonList(TaskManagerInterface.class);
   }
 
+  public void setEmitEventWrapper(EmitEventWrapper emitEventWrapper) {
+    mEmitEventWrapper = emitEventWrapper;
+  }
+
   //endregion
   //region ModuleRegistryConsumer
 
   @Override
   public void onCreate(ModuleRegistry moduleRegistry) {
     mUIManager = moduleRegistry.getModule(UIManager.class);
-    mEventEmitter = moduleRegistry.getModule(EventEmitter.class);
     mConstants = moduleRegistry.getModule(ConstantsInterface.class);
     mTaskService = moduleRegistry.getSingletonModule("TaskService", TaskServiceInterface.class);
 
@@ -83,7 +86,7 @@ public class TaskManagerInternalModule implements InternalModule, TaskManagerInt
       mEventsQueue.add(body);
     } else {
       // Manager is already being observed by JS app, so we can execute the event immediately.
-      mEventEmitter.emit(TaskManagerInterface.EVENT_NAME, body);
+      emitEvent(body);
     }
   }
 
@@ -100,7 +103,7 @@ public class TaskManagerInternalModule implements InternalModule, TaskManagerInt
     // Execute any events that came before this call.
     if (mEventsQueue != null) {
       for (Bundle body : mEventsQueue) {
-        mEventEmitter.emit(TaskManagerInterface.EVENT_NAME, body);
+        emitEvent(body);
       }
       mEventsQueue = null;
     }
@@ -183,5 +186,13 @@ public class TaskManagerInternalModule implements InternalModule, TaskManagerInt
     }
   }
 
+  private void emitEvent(Bundle body) {
+    if (mEmitEventWrapper != null) {
+      mEmitEventWrapper.emit(TaskManagerInterface.EVENT_NAME, body);
+    } else {
+      Log.e("ExpoTaskManager", "EmitEventWrapper is not set. Failed to emit the TaskManager Event.");
+    }
+  }
+
   //endregion
 }

package/android/src/main/java/expo/modules/taskManager/TaskManagerModule.kt

@@ -3,11 +3,13 @@ package expo.modules.taskManager
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
+import android.util.Log
 import expo.modules.core.errors.ModuleNotFoundException
 import expo.modules.interfaces.taskManager.TaskManagerInterface
 import expo.modules.interfaces.taskManager.TaskServiceInterface
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
+import java.lang.ref.WeakReference
 
 class TaskManagerModule : Module() {
   private val _taskService: TaskServiceInterface? by lazy {
@@ -30,6 +32,26 @@ class TaskManagerModule : Module() {
       "EVENT_NAME" to TaskManagerInterface.EVENT_NAME
     )
 
+    OnCreate {
+      // Slightly hacky way to be able to emit events using the new event emitter from legacy modules.
+      val weakModule = WeakReference(this@TaskManagerModule)
+      val emitEvent = { name: String, body: Bundle ->
+        try {
+          // It may throw, because RN event emitter may not be available
+          // we can just ignore those cases
+          weakModule.get()?.sendEvent(name, body)
+        } catch (error: Throwable) {
+          Log.e("ExpoTaskManager", "Failed to emit event $name using the module's event emitter: ${error.message}")
+        }
+        Unit
+      }
+
+      // For compatibility reasons, we don't want to edit TaskManagerInterface, as it's in the expo-modules-core package.
+      // There is only one usage of the TaskManagerInterface and it's the TaskManagerInternalModule, so we can safely cast
+      // to it and set it's emitEventWrapper.
+      (appContext.legacyModule<TaskManagerInterface>() as? TaskManagerInternalModule)?.setEmitEventWrapper(emitEvent)
+    }
+
     AsyncFunction<Boolean>("isAvailableAsync") {
       return@AsyncFunction true
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-task-manager",
-  "version": "11.8.1",
+  "version": "11.8.2",
   "description": "Expo module that provides support for tasks that can run in the background.",
   "main": "build/TaskManager.js",
   "types": "build/TaskManager.d.ts",
@@ -41,5 +41,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "ee4f30ef3b5fa567ad1bf94794197f7683fdd481"
+  "gitHead": "979e9f1fc3cfa9c827700dcf99992e671cfdf63e"
 }