Merge pull request #1278 from frankenthumbs/main

Functions to remove specific subscription observers

Author: Rodrigo Gomez Palacio

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

@@ -120,12 +120,9 @@ private String appIdFromManifest(ReactApplicationContext context) {
    }
 
    private void removeObservers() {
-      OneSignal.removeEmailSubscriptionObserver(this);
-      OneSignal.removePermissionObserver(this);
-      OneSignal.removeSubscriptionObserver(this);
-      hasSetEmailSubscriptionObserver = false;
-      hasSetPermissionObserver = false;
-      hasSetSubscriptionObserver = false;
+      this.removeEmailSubscriptionObserver();
+      this.removePermissionObserver();
+      this.removeSubscriptionObserver();
    }
 
    private void removeHandlers() {
@@ -217,6 +214,14 @@ public void addPermissionObserver() {
       }
    }
 
+   @ReactMethod
+   public void removePermissionObserver() {
+      if (hasSetPermissionObserver) {
+         OneSignal.removePermissionObserver(this);
+         hasSetPermissionObserver = false;
+      }
+   }
+
    @ReactMethod
    public void addSubscriptionObserver() {
       if (!hasSetSubscriptionObserver) {
@@ -225,6 +230,14 @@ public void addSubscriptionObserver() {
       }
    }
 
+   @ReactMethod
+   public void removeSubscriptionObserver() {
+      if (hasSetSubscriptionObserver) {
+         OneSignal.removeSubscriptionObserver(this);
+         hasSetSubscriptionObserver = false;
+      }
+   }
+
    @ReactMethod
    public void addEmailSubscriptionObserver() {
       if (!hasSetEmailSubscriptionObserver) {
@@ -233,6 +246,14 @@ public void addEmailSubscriptionObserver() {
       }
    }
 
+   @ReactMethod
+   public void removeEmailSubscriptionObserver() {
+      if (hasSetEmailSubscriptionObserver) {
+         OneSignal.removeEmailSubscriptionObserver(this);
+         hasSetEmailSubscriptionObserver = false;
+      }
+   }
+
    @ReactMethod
    public void addSMSSubscriptionObserver() {
       if (!hasSetSMSSubscriptionObserver) {
@@ -241,6 +262,14 @@ public void addSMSSubscriptionObserver() {
       }
    }
 
+   @ReactMethod
+   public void removeSMSSubscriptionObserver() {
+      if (hasSetSMSSubscriptionObserver) {
+         OneSignal.removeSMSSubscriptionObserver(this);
+         hasSetSMSSubscriptionObserver = false;
+      }
+   }
+
    /* Other methods */
 
    @ReactMethod

ios/RCTOneSignal/RCTOneSignalEventEmitter.m

@@ -103,27 +103,55 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
     }
 }
 
+RCT_EXPORT_METHOD(removePermissionObserver) {
+    if (_hasSetPermissionObserver) {
+        [OneSignal removePermissionObserver:[RCTOneSignal sharedInstance]];
+        _hasSetPermissionObserver = false;
+    }
+}
+
 RCT_EXPORT_METHOD(addSubscriptionObserver) {
     if (!_hasSetSubscriptionObserver) {
         [OneSignal addSubscriptionObserver:[RCTOneSignal sharedInstance]];
         _hasSetSubscriptionObserver = true;
     }
 }
 
+RCT_EXPORT_METHOD(removeSubscriptionObserver) {
+    if (_hasSetSubscriptionObserver) {
+        [OneSignal removeSubscriptionObserver:[RCTOneSignal sharedInstance]];
+        _hasSetSubscriptionObserver = false;
+    }
+}
+
 RCT_EXPORT_METHOD(addEmailSubscriptionObserver) {
     if (!_hasSetEmailSubscriptionObserver) {
         [OneSignal addEmailSubscriptionObserver:[RCTOneSignal sharedInstance]];
         _hasSetEmailSubscriptionObserver = true;
     }
 }
 
+RCT_EXPORT_METHOD(removeEmailSubscriptionObserver) {
+    if (_hasSetEmailSubscriptionObserver) {
+        [OneSignal removeEmailSubscriptionObserver:[RCTOneSignal sharedInstance]];
+        _hasSetEmailSubscriptionObserver = false;
+    }
+}
+
 RCT_EXPORT_METHOD(addSMSSubscriptionObserver) {
     if (!_hasSetSMSSubscriptionObserver) {
         [OneSignal addSMSSubscriptionObserver:[RCTOneSignal sharedInstance]];
         _hasSetSMSSubscriptionObserver = true;
     }
 }
 
+RCT_EXPORT_METHOD(removeSMSSubscriptionObserver) {
+    if (_hasSetSMSSubscriptionObserver) {
+        [OneSignal removeSMSSubscriptionObserver:[RCTOneSignal sharedInstance]];
+        _hasSetSMSSubscriptionObserver = false;
+    }
+}
+
 RCT_REMAP_METHOD(requiresUserPrivacyConsent, requiresPrivacyConsentResolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject) {
     resolve(@(OneSignal.requiresUserPrivacyConsent));

src/EventManager.js

@@ -69,6 +69,15 @@ export default class EventManager {
         handlerArray && handlerArray.length > 0 ? handlerArray.push(handler) : this.eventHandlerArrayMap.set(eventName, [handler]);
     }
 
+    /**
+     * clears the event handler(s) for the event name
+     * @param  {string} eventName
+     * @param  {function} handler
+     */
+    clearEventHandler(eventName) {
+        this.eventHandlerArrayMap.delete(eventName);
+    }
+
     // returns an event listener with the js to native mapping
     generateEventListener(eventName) {
         const addListenerCallback = (payload) => {

src/index.d.ts

@@ -123,7 +123,7 @@ declare module 'react-native-onesignal' {
         isPushDisabled                  : boolean;
         isEmailSubscribed               : boolean;
         isSMSSubscribed                 : boolean;
-        hasNotificationPermission       ?: boolean; // ios only
+        hasNotificationPermission       ?: boolean; // is areNotificationsEnabled on android
         notificationPermissionStatus    ?: IosPermissionStatus;  // ios only
         // areNotificationsEnabled (android) not included since it is converted to hasNotificationPermission in bridge
     }
@@ -144,27 +144,51 @@ declare module 'react-native-onesignal' {
          */
         addPermissionObserver(observer: (event: ChangeEvent<PermissionChange>) => void): void;
 
+        /**
+         * Clears current permission observers.
+         * @returns void
+         */
+        clearPermissionObservers(): void;
+
         /**
          * Add a callback that fires when the OneSignal subscription state changes.
          * @param  {(event:ChangeEvent<SubscriptionChange>)=>void} observer
          * @returns void
          */
         addSubscriptionObserver(observer: (event: ChangeEvent<SubscriptionChange>) => void): void;
 
+        /**
+         * Clears current subscription observers.
+         * @returns void
+         */
+        clearSubscriptionObservers(): void;
+
         /**
          * Add a callback that fires when the OneSignal email subscription changes.
          * @param  {(event:ChangeEvent<EmailSubscriptionChange>)=>void} observer
          * @returns void
          */
         addEmailSubscriptionObserver(observer: (event: ChangeEvent<EmailSubscriptionChange>) => void): void;
 
+        /**
+         * Clears current email subscription observers.
+         * @returns void
+         */
+        clearEmailSubscriptionObservers(): void;
+
         /**
          * Add a callback that fires when the OneSignal sms subscription changes.
          * @param  {(event:ChangeEvent<SMSSubscriptionChange>)=>void} observer
          * @returns void
          */
         addSMSSubscriptionObserver(observer: (event: ChangeEvent<SMSSubscriptionChange>) => void): void;
 
+        /**
+         * Clears current SMS subscription observers.
+         * @returns void
+         */
+         clearSMSSubscriptionObservers(): void;
+
         /**
          * Set the callback to run just before displaying a notification while the app is in focus.
          * @param  {(event:NotificationReceivedEvent)=>void} handler

src/index.js

@@ -37,27 +37,51 @@ export default class OneSignal {
         eventManager.addEventHandler(PERMISSION_CHANGED, observer);
     }
 
+    static clearPermissionObservers() {
+        if (!isObjectNonNull(RNOneSignal)) return;
+        RNOneSignal.removePermissionObserver();
+        eventManager.clearEventHandler(PERMISSION_CHANGED);
+    }
+    
     static addSubscriptionObserver(observer) {
         if (!isObjectNonNull(RNOneSignal)) return;
         isValidCallback(observer);
         RNOneSignal.addSubscriptionObserver();
         eventManager.addEventHandler(SUBSCRIPTION_CHANGED, observer);
     }
 
+    static clearSubscriptionObservers() {
+        if (!isObjectNonNull(RNOneSignal)) return;
+        RNOneSignal.removeSubscriptionObserver();
+        eventManager.clearEventHandler(SUBSCRIPTION_CHANGED);
+    }
+    
     static addEmailSubscriptionObserver(observer) {
         if (!isObjectNonNull(RNOneSignal)) return;
         isValidCallback(observer);
         RNOneSignal.addEmailSubscriptionObserver();
         eventManager.addEventHandler(EMAIL_SUBSCRIPTION_CHANGED, observer);
     }
 
+    static clearEmailSubscriptionObservers() {
+        if (!isObjectNonNull(RNOneSignal)) return;
+        RNOneSignal.removeEmailSubscriptionObserver();
+        eventManager.clearEventHandler(EMAIL_SUBSCRIPTION_CHANGED);
+    }
+    
     static addSMSSubscriptionObserver(observer) {
         if (!isObjectNonNull(RNOneSignal)) return;
         isValidCallback(observer);
         RNOneSignal.addSMSSubscriptionObserver();
         eventManager.addEventHandler(SMS_SUBSCRIPTION_CHANGED, observer);
     }
 
+    static clearSMSSubscriptionObservers() {
+        if (!isObjectNonNull(RNOneSignal)) return;
+        RNOneSignal.removeSMSSubscriptionObserver();
+        eventManager.clearEventHandler(SMS_SUBSCRIPTION_CHANGED);
+    }
+
     /* H A N D L E R S */
 
     /**