expo-modules-core 0.6.0 → 0.6.4

package/CHANGELOG.md

@@ -10,6 +10,28 @@
 
 ### 💡 Others
 
+## 0.6.4 — 2022-01-05
+
+### 🐛 Bug fixes
+
+- Fix `ReactInstanceManager.onHostPause` exception from moving Android apps to background. ([#15748](https://github.com/expo/expo/pull/15748) by [@kudo](https://github.com/kudo))
+
+## 0.6.3 — 2021-12-16
+
+### 🐛 Bug fixes
+
+- Fixed the deep link wasn't passed to the application if the application wasn't running when the deep link was sent. ([#15593](https://github.com/expo/expo/pull/15593) by [@lukmccall](https://github.com/lukmccall))
+
+## 0.6.2 — 2021-12-15
+
+### 🎉 New features
+
+- Add `onNewIntent` and `onBackPressed` support to `ReactActivityLifecycleListener`. ([#15550](https://github.com/expo/expo/pull/15550) by [@Kudo](https://github.com/Kudo))
+
+## 0.6.1 — 2021-12-08
+
+_This version does not introduce any user-facing changes._
+
 ## 0.6.0 — 2021-12-03
 
 ### 🎉 New features

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven'
 
 group = 'host.exp.exponent'
-version = '0.6.0'
+version = '0.6.4'
 
 buildscript {
   // Simple helper that allows the root project to override versions declared by this library.
@@ -58,7 +58,7 @@ android {
     targetSdkVersion safeExtGet("targetSdkVersion", 30)
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "0.6.0"
+    versionName "0.6.4"
   }
   lintOptions {
     abortOnError false

package/android/src/main/java/expo/modules/adapters/react/ModuleRegistryAdapter.java

@@ -15,6 +15,7 @@ import expo.modules.core.ModuleRegistry;
 import expo.modules.core.interfaces.InternalModule;
 import expo.modules.core.interfaces.Package;
 import expo.modules.kotlin.KotlinInteropModuleRegistry;
+import expo.modules.kotlin.ModulesProvider;
 import expo.modules.kotlin.views.ViewWrapperDelegateHolder;
 
 /**
@@ -24,6 +25,7 @@ import expo.modules.kotlin.views.ViewWrapperDelegateHolder;
  */
 public class ModuleRegistryAdapter implements ReactPackage {
   protected ReactModuleRegistryProvider mModuleRegistryProvider;
+  protected ModulesProvider mModulesProvider;
   protected ReactAdapterPackage mReactAdapterPackage = new ReactAdapterPackage();
   private NativeModulesProxy mModulesProxy;
   // We need to save all view holders to update them when the new kotlin module registry will be created.
@@ -37,6 +39,11 @@ public class ModuleRegistryAdapter implements ReactPackage {
     mModuleRegistryProvider = moduleRegistryProvider;
   }
 
+  public ModuleRegistryAdapter(ReactModuleRegistryProvider moduleRegistryProvider, ModulesProvider modulesProvider) {
+    mModuleRegistryProvider = moduleRegistryProvider;
+    mModulesProvider = modulesProvider;
+  }
+
   @Override
   public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
     ModuleRegistry moduleRegistry = mModuleRegistryProvider.get(reactContext);
@@ -57,7 +64,7 @@ public class ModuleRegistryAdapter implements ReactPackage {
   protected List<NativeModule> getNativeModulesFromModuleRegistry(ReactApplicationContext reactContext, ModuleRegistry moduleRegistry) {
     List<NativeModule> nativeModulesList = new ArrayList<>(2);
 
-    mModulesProxy = new NativeModulesProxy(reactContext, moduleRegistry);
+    mModulesProxy = createNativeModulesProxy(reactContext, moduleRegistry);
     nativeModulesList.add(mModulesProxy);
 
     // Add listener that will notify expo.modules.core.ModuleRegistry when all modules are ready
@@ -97,4 +104,12 @@ public class ModuleRegistryAdapter implements ReactPackage {
 
     return viewManagerList;
   }
+
+  private NativeModulesProxy createNativeModulesProxy(ReactApplicationContext reactContext, ModuleRegistry moduleRegistry) {
+    if (mModulesProvider != null) {
+      return new NativeModulesProxy(reactContext, moduleRegistry, mModulesProvider);
+    } else {
+      return new NativeModulesProxy(reactContext, moduleRegistry);
+    }
+  }
 }

package/android/src/main/java/expo/modules/adapters/react/apploader/RNHeadlessAppLoader.kt

@@ -3,6 +3,7 @@ package expo.modules.adapters.react.apploader
 import android.content.Context
 import com.facebook.react.ReactApplication
 import com.facebook.react.ReactInstanceManager
+import com.facebook.react.common.LifecycleState
 import expo.modules.apploader.HeadlessAppLoader
 import expo.modules.core.interfaces.Consumer
 import expo.modules.core.interfaces.DoNotStrip
@@ -43,7 +44,12 @@ class RNHeadlessAppLoader @DoNotStrip constructor(private val context: Context)
     return if (appRecords.containsKey(appScopeKey) && appRecords[appScopeKey] != null) {
       val appRecord: ReactInstanceManager = appRecords[appScopeKey]!!
       android.os.Handler(context.mainLooper).post {
-        appRecord.destroy()
+        // Only destroy the `ReactInstanceManager` if it does not bind with an Activity.
+        // And The Activity would take over the ownership of `ReactInstanceManager`.
+        // This case happens when a user clicks a background task triggered notification immediately.
+        if (appRecord.lifecycleState == LifecycleState.BEFORE_CREATE) {
+          appRecord.destroy()
+        }
         HeadlessAppLoaderNotifier.notifyAppDestroyed(appScopeKey)
         appRecords.remove(appScopeKey)
       }

package/android/src/main/java/expo/modules/core/interfaces/ReactActivityLifecycleListener.java

@@ -1,6 +1,7 @@
 package expo.modules.core.interfaces;
 
 import android.app.Activity;
+import android.content.Intent;
 import android.os.Bundle;
 
 public interface ReactActivityLifecycleListener {
@@ -11,4 +12,26 @@ public interface ReactActivityLifecycleListener {
   default void onPause(Activity activity) {}
 
   default void onDestroy(Activity activity) {}
+
+  /**
+   * Called when {@link com.facebook.react.ReactActivity} received `onNewIntent`
+   * Every listener will receive this callback.
+   * `ReactActivityDelegateWrapper.onNewIntent` will get `true` if there's some module returns `true`
+   *
+   * @return true if this module wants to return `true` from `ReactActivityDelegateWrapper.onNewIntent`
+   */
+  default boolean onNewIntent(Intent intent) {
+    return false;
+  }
+
+  /**
+   * Called when {@link com.facebook.react.ReactActivity} received `onBackPressed`
+   * Every listener will receive this callback.
+   * `ReactActivityDelegateWrapper.onBackPressed` will get `true` if there's some module returns `true`
+   *
+   * @return true if this module wants to return `true` from `ReactActivityDelegateWrapper.onBackPressed`
+   */
+  default boolean onBackPressed() {
+    return false;
+  }
 }

package/ios/AppDelegates/ExpoAppDelegate.swift

@@ -21,8 +21,19 @@ open class ExpoAppDelegate: UIResponder, UIApplicationDelegate {
   // MARK: - Initializing the App
 
   open func application(_ application: UIApplication, willFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
-    return subscribers.reduce(false) { result, subscriber in
-      return subscriber.application?(application, willFinishLaunchingWithOptions: launchOptions) ?? false || result
+    let parsedSubscribers = subscribers.filter {
+      $0.responds(to: #selector(application(_:willFinishLaunchingWithOptions:)))
+    }
+    
+    // If we can't find a subscriber that implements `willFinishLaunchingWithOptions`, we will delegate the decision if we can handel the passed URL to
+    // the `didFinishLaunchingWithOptions` method by returning `true` here.
+    //  You can read more about how iOS handles deep links here: https://developer.apple.com/documentation/uikit/uiapplicationdelegate/1623112-application#discussion
+    if (parsedSubscribers.isEmpty) {
+      return true;
+    }
+    
+    return parsedSubscribers.reduce(false) { result, subscriber in
+      return subscriber.application!(application, willFinishLaunchingWithOptions: launchOptions) || result
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "0.6.0",
+  "version": "0.6.4",
   "description": "The core of Expo Modules architecture",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -42,5 +42,5 @@
     "@testing-library/react-hooks": "^7.0.1",
     "expo-module-scripts": "^2.0.0"
   },
-  "gitHead": "2e5c6983b86d5ecfca028ba64002897d8adc2cc4"
+  "gitHead": "81d318c3ac2db24ba192d2b3fc5a2dd1bbd8bd4d"
 }