clean up hooks

Author: fadi-george

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

@@ -179,20 +179,20 @@ private void removeObservers() {
 
     private void removeHandlers() {
         if (hasAddedInAppMessageClickListener) {
-          OneSignal.getInAppMessages().removeClickListener(rnInAppClickListener);
-          hasAddedInAppMessageClickListener = false;
+            OneSignal.getInAppMessages().removeClickListener(rnInAppClickListener);
+            hasAddedInAppMessageClickListener = false;
         }
         if (hasAddedInAppMessageLifecycleListener) {
-          OneSignal.getInAppMessages().removeLifecycleListener(rnInAppLifecycleListener);
-          hasAddedInAppMessageLifecycleListener = false;
+            OneSignal.getInAppMessages().removeLifecycleListener(rnInAppLifecycleListener);
+            hasAddedInAppMessageLifecycleListener = false;
         }
         if (hasAddedNotificationClickListener) {
-          OneSignal.getNotifications().removeClickListener(rnNotificationClickListener);
-          hasAddedNotificationClickListener = false;
+            OneSignal.getNotifications().removeClickListener(rnNotificationClickListener);
+            hasAddedNotificationClickListener = false;
         }
         if (hasAddedNotificationForegroundListener) {
-          OneSignal.getNotifications().removeForegroundLifecycleListener(this);
-          hasAddedNotificationForegroundListener = false;
+            OneSignal.getNotifications().removeForegroundLifecycleListener(this);
+            hasAddedNotificationForegroundListener = false;
         }
     }
 

examples/RNOneSignalTS/OSDemo.tsx

@@ -135,16 +135,13 @@ const OSDemo: React.FC = () => {
   );
 
   useEffect(() => {
-    const initializeOneSignal = async () => {
-      OneSignal.initialize(APP_ID);
-      OneSignal.Debug.setLogLevel(LogLevel.None);
+    OneSignal.initialize(APP_ID);
+    OneSignal.Debug.setLogLevel(LogLevel.None);
+  }, []);
 
+  useEffect(() => {
+    const setup = async () => {
       OneSignal.LiveActivities.setupDefault();
-      // OneSignal.LiveActivities.setupDefault({
-      //   enablePushToStart: false,
-      //   enablePushToUpdate: true,
-      // });
-
       OneSignal.Notifications.addEventListener(
         'foregroundWillDisplay',
         onForegroundWillDisplay,
@@ -166,7 +163,7 @@ const OSDemo: React.FC = () => {
       OneSignal.User.addEventListener('change', onUserChange);
     };
 
-    initializeOneSignal();
+    setup();
 
     return () => {
       // Clean up all event listeners