clean up remove handlers logic

Author: fadi-george

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

@@ -178,19 +178,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) {

ios/RCTOneSignal/RCTOneSignalEventEmitter.m

@@ -602,15 +602,23 @@ - (void)removeObservers {
 }
 
 - (void)removeHandlers {
-  [OneSignal.InAppMessages removeClickListener:[RCTOneSignal sharedInstance]];
-  _hasAddedInAppMessageClickListener = false;
-  [OneSignal.InAppMessages
-      removeLifecycleListener:[RCTOneSignal sharedInstance]];
-  _hasAddedInAppMessageLifecycleListener = false;
-  [OneSignal.Notifications removeClickListener:[RCTOneSignal sharedInstance]];
-  _hasAddedNotificationClickListener = false;
-  [OneSignal.Notifications removeForegroundLifecycleListener:self];
-  _hasAddedNotificationForegroundLifecycleListener = false;
+  if (_hasAddedInAppMessageClickListener) {
+    [OneSignal.InAppMessages removeClickListener:[RCTOneSignal sharedInstance]];
+    _hasAddedInAppMessageClickListener = false;
+  }
+  if (_hasAddedInAppMessageLifecycleListener) {
+    [OneSignal.InAppMessages
+        removeLifecycleListener:[RCTOneSignal sharedInstance]];
+    _hasAddedInAppMessageLifecycleListener = false;
+  }
+  if (_hasAddedNotificationClickListener) {
+    [OneSignal.Notifications removeClickListener:[RCTOneSignal sharedInstance]];
+    _hasAddedNotificationClickListener = false;
+  }
+  if (_hasAddedNotificationForegroundLifecycleListener) {
+    [OneSignal.Notifications removeForegroundLifecycleListener:self];
+    _hasAddedNotificationForegroundLifecycleListener = false;
+  }
 }
 
 - (void)removeUserStateObserver {