@sentiance-react-native/core 6.15.0-rc.3 → 6.15.0-rc.5

package/RNSentianceCore.podspec

@@ -5,7 +5,7 @@ sentiance_sdk_env_var_version = ENV["SENTIANCE_RN_IOS_SDK_VERSION"]
 
 Pod::Spec.new do |s|
   s.name         = "RNSentianceCore"
-  s.version      = "6.15.0-rc.3"
+  s.version      = "6.15.0-rc.5"
   s.summary      = "RNSentianceCore"
   s.description  = <<-DESC
                    RNSentianceCore

package/android/build.gradle

@@ -1,14 +1,26 @@
 plugins {
-  id "com.android.library"
+    id "com.android.library"
 }
 
 android {
-  namespace "com.sentiance.react.bridge.core"
+    namespace "com.sentiance.react.bridge.core"
 
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
-  }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    buildFeatures {
+        buildConfig = true
+    }
+
+    def isNewArchEnabled =
+            (project.findProperty('newArchEnabled') ?: "false").toBoolean()
+
+    defaultConfig {
+        consumerProguardFiles 'rules-consumer.pro'
+        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchEnabled.toString()
+    }
 }
 
 apply from: "$project.projectDir/package-json-reader.gradle"
@@ -19,12 +31,12 @@ applyAndroidVersionsFrom(packageJson)
 def sentianceSdkVersion = getSentianceSdkVersion()
 
 dependencies {
-  implementation(platform("com.sentiance:sdk-bom:${sentianceSdkVersion}"))
-  api("com.sentiance:sdk") { transitive = true }
+    implementation(platform("com.sentiance:sdk-bom:${sentianceSdkVersion}"))
+    api("com.sentiance:sdk") { transitive = true }
 
-  if (findProject(':test-common')) {
-    testImplementation project(':test-common')
-  }
+    if (findProject(':test-common')) {
+        testImplementation project(':test-common')
+    }
 }
 
 applyReactNativeDependency()

package/android/consumer-rules.pro

@@ -0,0 +1,4 @@
+-keepclassmembers class com.sentiance.react.bridge.core.BuildConfig {
+    public static final boolean IS_NEW_ARCHITECTURE_ENABLED;
+}
+-keep class com.sentiance.react.bridge.core.BuildConfig

package/android/src/main/java/com/sentiance/react/bridge/core/common/base/AbstractSentianceEmitter.java

@@ -4,56 +4,53 @@ import android.content.Context;
 import android.os.Handler;
 import android.os.Looper;
 
-import com.facebook.react.ReactApplication;
-import com.facebook.react.ReactNativeHost;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
+import com.sentiance.react.bridge.core.common.util.ReactContextProvider;
 
 public abstract class AbstractSentianceEmitter {
 
-  protected final Handler mHandler = new Handler(Looper.getMainLooper());
-  protected ReactContext reactContext;
-  protected ReactNativeHost reactNativeHost;
-
-  protected AbstractSentianceEmitter(Context context) {
-    ReactApplication reactApplication = ((ReactApplication) context.getApplicationContext());
-    reactNativeHost = reactApplication.getReactNativeHost();
-    reactContext = createReactContext();
-  }
-
-  protected ReactContext createReactContext() {
-    if (!reactNativeHost.getReactInstanceManager().hasStartedCreatingInitialContext())
-      reactNativeHost.getReactInstanceManager().createReactContextInBackground();
-    return reactNativeHost.getReactInstanceManager().getCurrentReactContext();
-  }
-
-  protected void sendEvent(final String key, final WritableMap map) {
-    if (reactContext != null && reactContext.hasActiveCatalystInstance()) {
-      this.reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(key, map);
-    } else {
-      // add delay
-      final Counter retry = new Counter(20);
-      mHandler.postDelayed(new Runnable() {
-        @Override
-        public void run() {
-          if (AbstractSentianceEmitter.this.reactContext == null)
-            AbstractSentianceEmitter.this.reactContext = createReactContext();
-          if (AbstractSentianceEmitter.this.reactContext != null && AbstractSentianceEmitter.this.reactContext.hasActiveCatalystInstance()) {
-            AbstractSentianceEmitter.this.reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(key, map);
-          } else if (retry.count-- > 0) {
-            mHandler.postDelayed(this, 500);
-          }
+    protected final Handler mHandler = new Handler(Looper.getMainLooper());
+    @Nullable
+    protected ReactContext reactContext;
+    @NonNull
+    protected ReactContextProvider reactContextProvider;
+
+    protected AbstractSentianceEmitter(Context context) {
+        reactContextProvider = new ReactContextProvider(context.getApplicationContext());
+        reactContext = reactContextProvider.createReactContext();
+    }
+
+    protected void sendEvent(final String key, final WritableMap map) {
+        if (reactContext != null && reactContext.hasActiveCatalystInstance()) {
+            this.reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(key, map);
+        } else {
+            // add delay
+            final Counter retry = new Counter(20);
+            mHandler.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    if (AbstractSentianceEmitter.this.reactContext == null)
+                        AbstractSentianceEmitter.this.reactContext = reactContextProvider.createReactContext();
+                    if (AbstractSentianceEmitter.this.reactContext != null && AbstractSentianceEmitter.this.reactContext.hasActiveCatalystInstance()) {
+                        AbstractSentianceEmitter.this.reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(key, map);
+                    } else if (retry.count-- > 0) {
+                        mHandler.postDelayed(this, 500);
+                    }
+                }
+            }, 500);
         }
-      }, 500);
     }
-  }
 
-  private static class Counter {
-    int count;
+    private static class Counter {
+        int count;
 
-    Counter(int count) {
-      this.count = count;
+        Counter(int count) {
+            this.count = count;
+        }
     }
-  }
 }

package/android/src/main/java/com/sentiance/react/bridge/core/common/util/ReactContextProvider.java

@@ -0,0 +1,72 @@
+package com.sentiance.react.bridge.core.common.util;
+
+import android.content.Context;
+import android.util.Log;
+
+import androidx.annotation.Nullable;
+
+import com.facebook.react.ReactApplication;
+import com.facebook.react.ReactNativeHost;
+import com.facebook.react.bridge.ReactContext;
+import com.sentiance.react.bridge.core.BuildConfig;
+
+public final class ReactContextProvider {
+
+    private static final String TAG = "ReactNativeContextProvider";
+
+    private final ReactApplication mReactApplication;
+
+    public ReactContextProvider(Context applicationContext) {
+        mReactApplication = (ReactApplication) applicationContext;
+    }
+
+    /**
+     * Triggers the initialization of a React context if it is not initializing already,
+     * or returns the current React context if it is already initialized.
+     *
+     * If this call does end up triggering the initialization of a React context,
+     * then it will probably return <code>null</code> since the operation is asynchronous.
+     *
+     * @return a ReactContext if it exists, null otherwise.
+     */
+    @Nullable
+    public ReactContext createReactContext() {
+        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+            return createReactContextInNewArchMode();
+        } else {
+            return createReactContextInLegacyArchMode();
+        }
+    }
+
+    @Nullable
+    private ReactContext createReactContextInNewArchMode() {
+        try {
+            java.lang.reflect.Method getReactHost = mReactApplication.getClass().getMethod("getReactHost");
+            Object reactHost = getReactHost.invoke(mReactApplication);
+            Class<?> reactHostClass = Class.forName("com.facebook.react.ReactHost");
+
+            java.lang.reflect.Method start = reactHostClass.getMethod("start");
+            java.lang.reflect.Method getCurrentReactContext = reactHostClass.getMethod("getCurrentReactContext");
+
+            // Trigger the initialization of a React context, should be safe to call multiple times
+            // https://github.com/facebook/react-native/blob/main/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.kt#L723
+            start.invoke(reactHost);
+
+            return (ReactContext) getCurrentReactContext.invoke(reactHost);
+        } catch (Throwable t) {
+            Log.d(TAG, "Failed to create React context");
+            return null;
+        }
+    }
+
+    @Nullable
+    private ReactContext createReactContextInLegacyArchMode() {
+        ReactNativeHost reactNativeHost = mReactApplication.getReactNativeHost();
+
+        // Trigger the initialization of a React context
+        if (!reactNativeHost.getReactInstanceManager().hasStartedCreatingInitialContext())
+            reactNativeHost.getReactInstanceManager().createReactContextInBackground();
+
+        return reactNativeHost.getReactInstanceManager().getCurrentReactContext();
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentiance-react-native/core",
-  "version": "6.15.0-rc.3",
+  "version": "6.15.0-rc.5",
   "description": "The Sentiance Core library",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",