react-native-stallion 2.0.0-alpha.2 → 2.0.0-alpha.4

package/android/src/main/java/com/stallion/StallionModule.java

@@ -17,7 +17,6 @@ import com.stallion.storage.StallionConfigConstants;
 
 import com.stallion.storage.StallionMetaConstants;
 import com.stallion.storage.StallionStateManager;
-import com.stallion.utils.StallionExceptionHandler;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -28,20 +27,27 @@ import java.util.List;
 
 @ReactModule(name = StallionConfigConstants.MODULE_NAME)
 public class StallionModule extends ReactContextBaseJavaModule implements LifecycleEventListener {
-  private final ReactApplicationContext currentReactContext;
   private final StallionStateManager stallionStateManager;
 
   public StallionModule(ReactApplicationContext reactContext) {
     super(reactContext);
     StallionStateManager.init(reactContext);
     this.stallionStateManager = StallionStateManager.getInstance();
-    this.currentReactContext = reactContext;
-    StallionExceptionHandler.initErrorBoundary(reactContext);
+    StallionEventManager.init(this.stallionStateManager);
     reactContext.addLifecycleEventListener(this);
   }
 
   @Override
   public void onHostResume() {
+    if (
+        StallionEventManager.getInstance().getEmitter() == null
+          && getReactApplicationContext().getCatalystInstance() != null
+    ) {
+      DeviceEventManagerModule.RCTDeviceEventEmitter eventEmitter = getReactApplicationContext().getJSModule(
+        DeviceEventManagerModule.RCTDeviceEventEmitter.class
+      );
+      StallionEventManager.getInstance().setEmitter(eventEmitter);
+    }
     StallionSyncHandler.sync();
   }
 
@@ -54,7 +60,8 @@ public class StallionModule extends ReactContextBaseJavaModule implements Lifecy
   @Override
   public void onCatalystInstanceDestroy() {
     super.onCatalystInstanceDestroy();
-    this.currentReactContext.removeLifecycleEventListener(this);
+    stallionStateManager.setIsMounted(false);
+    getReactApplicationContext().removeLifecycleEventListener(this);
   }
 
   @Override
@@ -66,12 +73,6 @@ public class StallionModule extends ReactContextBaseJavaModule implements Lifecy
   @ReactMethod
   public void onLaunch(String launchData) {
     stallionStateManager.setIsMounted(true);
-
-    DeviceEventManagerModule.RCTDeviceEventEmitter eventEmitter = this.currentReactContext.getJSModule(
-      DeviceEventManagerModule.RCTDeviceEventEmitter.class
-    );
-    StallionEventManager.getInstance().setEmitter(eventEmitter);
-
     checkPendingDownloads();
   }
 

package/android/src/main/java/com/stallion/events/StallionEventManager.java

@@ -12,6 +12,7 @@ import org.json.JSONObject;
 import java.util.Iterator;
 import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
 
 public class StallionEventManager {
   public  static final String STALLION_NATIVE_EVENT_NAME = "STALLION_NATIVE_EVENT";
@@ -20,7 +21,7 @@ public class StallionEventManager {
 
   private static StallionEventManager instance;
   private final StallionStateManager stallionStateManager;
-  private DeviceEventManagerModule.RCTDeviceEventEmitter eventEmitter;
+  private final AtomicReference<DeviceEventManagerModule.RCTDeviceEventEmitter> eventEmitterRef = new AtomicReference<>();
 
   // Private constructor for Singleton
   private StallionEventManager(StallionStateManager stateManager) {
@@ -35,7 +36,11 @@ public class StallionEventManager {
   }
 
   public void setEmitter(DeviceEventManagerModule.RCTDeviceEventEmitter deviceEmitter) {
-    eventEmitter = deviceEmitter;
+    eventEmitterRef.set(deviceEmitter);
+  }
+
+  public DeviceEventManagerModule.RCTDeviceEventEmitter getEmitter() {
+    return eventEmitterRef.get();
   }
 
   // Get instance method
@@ -49,9 +54,9 @@ public class StallionEventManager {
   public void sendEventWithoutCaching(String eventName, JSONObject eventPayload) {
     try {
       eventPayload.put("type", eventName);
-
+      DeviceEventManagerModule.RCTDeviceEventEmitter eventEmitter = eventEmitterRef.get();
       // Emit the event to React Native
-      if (eventEmitter != null) {
+      if (eventEmitter != null && stallionStateManager.getIsMounted()) {
         eventEmitter.emit(STALLION_NATIVE_EVENT_NAME, eventPayload.toString());
       }
 
@@ -69,8 +74,9 @@ public class StallionEventManager {
 
       eventPayload.put("type", eventName);
 
+      DeviceEventManagerModule.RCTDeviceEventEmitter eventEmitter = eventEmitterRef.get();
       // Emit the event to React Native
-      if (eventEmitter != null) {
+      if (eventEmitter != null && stallionStateManager.getIsMounted()) {
         eventEmitter.emit(STALLION_NATIVE_EVENT_NAME, eventPayload.toString());
       }
 

package/android/src/main/java/com/stallion/networkmanager/StallionFileDownloader.java

@@ -128,7 +128,7 @@ public class StallionFileDownloader {
 
       // Ensure totalBytes is valid
       if (totalBytes <= 0) {
-        callback.onReject(StallionApiConstants.DOWNLOAD_ERROR_PREFIX, "Invalid content length: " + totalBytes);
+        callback.onReject(StallionApiConstants.DOWNLOAD_ERROR_PREFIX, "Invalid content length: ");
         return;
       }
 
@@ -158,7 +158,7 @@ public class StallionFileDownloader {
         return;
       }
     } catch (IOException e) {
-      callback.onReject(StallionApiConstants.DOWNLOAD_ERROR_PREFIX, "IOException occurred: " + e.getMessage());
+      callback.onReject(StallionApiConstants.DOWNLOAD_ERROR_PREFIX, "IOException occurred: ");
       throw e;
     } finally {
       if (connection != null) {
@@ -205,8 +205,11 @@ public class StallionFileDownloader {
         callback.onReject(StallionApiConstants.DOWNLOAD_ERROR_PREFIX, StallionApiConstants.CORRUPTED_FILE_ERROR);
       }
     } catch (Exception e) {
-      String filesystemError = e.getMessage();
-      callback.onReject(StallionApiConstants.DOWNLOAD_ERROR_PREFIX, StallionApiConstants.DOWNLOAD_FILESYSTEM_ERROR_MESSAGE + filesystemError);
+      String filesystemError = e.getMessage() != null ? e.getMessage() : "Unknown filesystem error";
+      callback.onReject(
+        StallionApiConstants.DOWNLOAD_ERROR_PREFIX,
+        StallionApiConstants.DOWNLOAD_FILESYSTEM_ERROR_MESSAGE + filesystemError
+      );
     } finally {
       StallionFileManager.deleteFileOrFolderSilently(downloadedZip);
     }

package/android/src/main/java/com/stallion/networkmanager/StallionSyncHandler.java

@@ -139,7 +139,8 @@ public class StallionSyncHandler {
   private static void emitSyncError(Exception e) {
     JSONObject syncErrorPayload = new JSONObject();
     try {
-      syncErrorPayload.put("meta", e.toString());
+      String syncErrorString = e.getMessage() != null ? e.getMessage() : "Unknown error";
+      syncErrorPayload.put("meta", syncErrorString);
     } catch (Exception ignored) { }
     StallionEventManager.getInstance().sendEvent(
       NativeProdEventTypes.SYNC_ERROR_PROD.toString(),

package/android/src/main/java/com/stallion/storage/StallionStateManager.java

@@ -3,6 +3,8 @@ package com.stallion.storage;
 import android.content.Context;
 import android.content.SharedPreferences;
 
+import com.stallion.utils.StallionExceptionHandler;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -32,6 +34,7 @@ public class StallionStateManager {
   public static synchronized void init(Context context) {
     if (instance == null) {
       instance = new StallionStateManager(context);
+      StallionExceptionHandler.initErrorBoundary();
     }
   }
 
@@ -88,7 +91,7 @@ public class StallionStateManager {
   public void setString(String key, String value) {
     SharedPreferences.Editor editor = sharedPreferences.edit();
     editor.putString(key, value);
-    editor.apply();
+    editor.commit();
   }
 
   public StallionConfig getStallionConfig() {

package/android/src/main/java/com/stallion/utils/StallionExceptionHandler.java

@@ -1,10 +1,7 @@
 package com.stallion.utils;
 
-import android.app.Activity;
-import android.content.Intent;
 import android.util.Log;
 
-import com.facebook.react.bridge.ReactApplicationContext;
 import com.stallion.events.StallionEventConstants;
 import com.stallion.events.StallionEventManager;
 import com.stallion.storage.StallionMetaConstants;
@@ -17,11 +14,15 @@ public class StallionExceptionHandler {
   private static Thread.UncaughtExceptionHandler _androidUncaughtExceptionHandler;
   private static Thread _exceptionThread;
   private static Throwable _exceptionThrowable;
-  private static Activity _reactActivity;
+  private static boolean isErrorBoundaryInitialized = false;
+
+  public static void initErrorBoundary() {
+    if (isErrorBoundaryInitialized) {
+      return; // Prevent multiple initializations
+    }
+    isErrorBoundaryInitialized = true;
 
-  public static void initErrorBoundary(ReactApplicationContext currentContext) {
     _androidUncaughtExceptionHandler = Thread.getDefaultUncaughtExceptionHandler();
-    _reactActivity = currentContext.getCurrentActivity();
     Thread.setDefaultUncaughtExceptionHandler((thread, throwable) -> {
       _exceptionThread = thread;
       _exceptionThrowable = throwable;
@@ -84,14 +85,7 @@ public class StallionExceptionHandler {
 
     StallionSlotManager.rollbackStage();
 
-    if (_reactActivity != null) {
-      Intent errorIntent = new Intent(_reactActivity, StallionErrorActivity.class);
-      errorIntent.putExtra("stack_trace_string", stackTraceString);
-      _reactActivity.startActivity(errorIntent);
-      _reactActivity.finish();
-    } else {
-      continueExceptionFlow();
-    }
+    continueExceptionFlow();
   }
 
   public static void continueExceptionFlow() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-stallion",
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0-alpha.4",
   "description": "Offical React Native SDK for Stallion",
   "main": "index",
   "types": "types/index.d.ts",