wip

Author: fadi-george

android/src/main/java/com/onesignal/rnonesignalandroid/RNOneSignal.java

@@ -104,6 +104,9 @@ public class RNOneSignal extends ReactContextBaseJavaModule implements
     private boolean hasAddedNotificationClickListener = false;
     private boolean hasAddedInAppMessageClickListener = false;
 
+    // Static reference to track current instance for cleanup on reload
+    private static RNOneSignal currentInstance = null;
+
     private IInAppMessageClickListener rnInAppClickListener = new IInAppMessageClickListener() {
         @Override
         public void onClick(IInAppMessageClickEvent event) {
@@ -171,19 +174,22 @@ private void removeObservers() {
     }
 
     private void removeHandlers() {
-        if(!oneSignalInitDone) {
-            Logging.debug("OneSignal React-Native SDK not initialized yet. Could not remove handlers.", null);
-            return;
+        if (hasAddedInAppMessageClickListener) {
+          OneSignal.getInAppMessages().removeClickListener(rnInAppClickListener);
+          hasAddedInAppMessageClickListener = false;
+        }
+        if (hasAddedInAppMessageLifecycleListener) {
+          OneSignal.getInAppMessages().removeLifecycleListener(rnInAppLifecycleListener);
+          hasAddedInAppMessageLifecycleListener = false;
+        }
+        if (hasAddedNotificationClickListener) {
+          OneSignal.getNotifications().removeClickListener(rnNotificationClickListener);
+          hasAddedNotificationClickListener = false;
+        }
+        if (hasAddedNotificationForegroundListener) {
+          OneSignal.getNotifications().removeForegroundLifecycleListener(this);
+          hasAddedNotificationForegroundListener = false;
         }
-
-        OneSignal.getInAppMessages().removeClickListener(rnInAppClickListener);
-        hasAddedInAppMessageClickListener = false;
-        OneSignal.getInAppMessages().removeLifecycleListener(rnInAppLifecycleListener);
-        hasAddedInAppMessageLifecycleListener = false;
-        OneSignal.getNotifications().removeClickListener(rnNotificationClickListener);
-        hasAddedNotificationClickListener = false;
-        OneSignal.getNotifications().removeForegroundLifecycleListener(this);
-        hasAddedNotificationForegroundListener = false;
     }
 
     private void sendEvent(String eventName, Object params) {
@@ -197,6 +203,13 @@ public RNOneSignal(ReactApplicationContext reactContext) {
         mReactContext.addLifecycleEventListener(this);
         notificationWillDisplayCache = new HashMap<String, INotificationWillDisplayEvent>();
         preventDefaultCache = new HashMap<String, INotificationWillDisplayEvent>();
+
+        // Clean up previous instance if it exists (handles reload scenario)
+        if (currentInstance != null && currentInstance != this) {
+            currentInstance.removeHandlers();
+            currentInstance.removeObservers();
+        }
+        currentInstance = this;
     }
 
 
@@ -549,7 +562,7 @@ public void onPushSubscriptionChange(PushSubscriptionChangedState pushSubscripti
             Logging.debug("Sending subscription change event", null);
         } catch (JSONException e) {
             e.printStackTrace();
-        } 
+        }
     }
 
     @ReactMethod
@@ -619,7 +632,7 @@ public void getTags(Promise promise) {
         for (Map.Entry<String, String> entry : tags.entrySet()) {
             writableTags.putString(entry.getKey(), entry.getValue());
         }
-        promise.resolve(writableTags); 
+        promise.resolve(writableTags);
     }
 
     @ReactMethod
@@ -718,7 +731,7 @@ public void onUserStateChange(UserChangedState state) {
             Logging.debug("Sending user state change event", null);
         } catch (JSONException e) {
             e.printStackTrace();
-        } 
+        }
     }
 
     @ReactMethod

examples/RNOneSignalTS/OSDemo.tsx

@@ -8,7 +8,11 @@ import {
   TextInput,
   View,
 } from 'react-native';
-import { LogLevel, OneSignal } from 'react-native-onesignal';
+import {
+  LogLevel,
+  NotificationWillDisplayEvent,
+  OneSignal,
+} from 'react-native-onesignal';
 import { renderButtonView } from './Helpers';
 import OSButtons from './OSButtons';
 import OSConsole from './OSConsole';
@@ -134,86 +138,40 @@ const OSDemo: React.FC = () => {
     [OSLog],
   );
 
+  const handleForegroundNotification = useCallback(
+    (event: NotificationWillDisplayEvent) => {
+      const notification = event.getNotification();
+      console.log('Arrived', notification);
+    },
+    [],
+  );
+
   useEffect(() => {
-    const initializeOneSignal = async () => {
+    const setup = async () => {
+      console.log('Issue-1610-11');
+      OneSignal.Debug.setLogLevel(LogLevel.Verbose);
       OneSignal.initialize(APP_ID);
-      OneSignal.Debug.setLogLevel(LogLevel.None);
-
-      OneSignal.LiveActivities.setupDefault();
-      // OneSignal.LiveActivities.setupDefault({
-      //   enablePushToStart: false,
-      //   enablePushToUpdate: true,
-      // });
-
-      OneSignal.Notifications.addEventListener(
-        'foregroundWillDisplay',
-        onForegroundWillDisplay,
-      );
-      OneSignal.Notifications.addEventListener('click', onNotificationClick);
-      OneSignal.InAppMessages.addEventListener('click', onIAMClick);
-      OneSignal.InAppMessages.addEventListener('willDisplay', onIAMWillDisplay);
-      OneSignal.InAppMessages.addEventListener('didDisplay', onIAMDidDisplay);
-      OneSignal.InAppMessages.addEventListener('willDismiss', onIAMWillDismiss);
-      OneSignal.InAppMessages.addEventListener('didDismiss', onIAMDidDismiss);
-      OneSignal.User.pushSubscription.addEventListener(
-        'change',
-        onSubscriptionChange,
+      OneSignal.Notifications.requestPermission(false);
+      console.log('OneSignal ID:', await OneSignal.User.getOnesignalId());
+      console.log('External ID:', await OneSignal.User.getExternalId());
+      console.log(
+        'Permission:',
+        await OneSignal.User.pushSubscription.getIdAsync(),
       );
       OneSignal.Notifications.addEventListener(
-        'permissionChange',
-        onPermissionChange,
+        'foregroundWillDisplay',
+        handleForegroundNotification,
       );
-      OneSignal.User.addEventListener('change', onUserChange);
     };
-
-    initializeOneSignal();
+    setup();
 
     return () => {
-      // Clean up all event listeners
       OneSignal.Notifications.removeEventListener(
         'foregroundWillDisplay',
-        onForegroundWillDisplay,
-      );
-      OneSignal.Notifications.removeEventListener('click', onNotificationClick);
-      OneSignal.InAppMessages.removeEventListener('click', onIAMClick);
-      OneSignal.InAppMessages.removeEventListener(
-        'willDisplay',
-        onIAMWillDisplay,
-      );
-      OneSignal.InAppMessages.removeEventListener(
-        'didDisplay',
-        onIAMDidDisplay,
-      );
-      OneSignal.InAppMessages.removeEventListener(
-        'willDismiss',
-        onIAMWillDismiss,
-      );
-      OneSignal.InAppMessages.removeEventListener(
-        'didDismiss',
-        onIAMDidDismiss,
-      );
-      OneSignal.User.pushSubscription.removeEventListener(
-        'change',
-        onSubscriptionChange,
-      );
-      OneSignal.Notifications.removeEventListener(
-        'permissionChange',
-        onPermissionChange,
+        handleForegroundNotification,
       );
-      OneSignal.User.removeEventListener('change', onUserChange);
     };
-  }, [
-    onForegroundWillDisplay,
-    onNotificationClick,
-    onIAMClick,
-    onIAMWillDisplay,
-    onIAMDidDisplay,
-    onIAMWillDismiss,
-    onIAMDidDismiss,
-    onSubscriptionChange,
-    onPermissionChange,
-    onUserChange,
-  ]);
+  }, [handleForegroundNotification]);
 
   const inputChange = useCallback((text: string) => {
     setInputValue(text);

examples/RNOneSignalTS/ios/Podfile.lock

@@ -2665,7 +2665,7 @@ SPEC CHECKSUMS:
   React-logger: a3cb5b29c32b8e447b5a96919340e89334062b48
   React-Mapbuffer: 9d2434a42701d6144ca18f0ca1c4507808ca7696
   React-microtasksnativemodule: 75b6604b667d297292345302cc5bfb6b6aeccc1b
-  react-native-onesignal: 6c5758aa56975db4bca9956d18d83dd62444c931
+  react-native-onesignal: b68c981956150f288c1585889871affcef3c0b8b
   react-native-safe-area-context: c00143b4823773bba23f2f19f85663ae89ceb460
   React-NativeModulesApple: 879fbdc5dcff7136abceb7880fe8a2022a1bd7c3
   React-oscompat: 93b5535ea7f7dff46aaee4f78309a70979bdde9d