Merge pull request #680 from geektimecoil/fix_intent_filter

Remove Intent-Filter Usage

Author: Nightsd01

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

@@ -5,8 +5,6 @@
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
 import android.os.Bundle;
 import android.util.Log;
 import android.content.pm.ApplicationInfo;
@@ -32,6 +30,12 @@
 import com.onesignal.OneSignal.EmailUpdateHandler;
 import com.onesignal.OneSignal.EmailUpdateError;
 
+
+import com.onesignal.OneSignal.NotificationOpenedHandler;
+import com.onesignal.OneSignal.NotificationReceivedHandler;
+import com.onesignal.OSNotificationOpenResult;
+import com.onesignal.OSNotification;
+
 import org.json.JSONObject;
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -40,16 +44,19 @@
 /**
 * Created by Avishay on 1/31/16.
 */
-public class RNOneSignal extends ReactContextBaseJavaModule implements LifecycleEventListener {
-   public static final String NOTIFICATION_OPENED_INTENT_FILTER = "GTNotificationOpened";
-   public static final String NOTIFICATION_RECEIVED_INTENT_FILTER = "GTNotificationReceived";
+public class RNOneSignal extends ReactContextBaseJavaModule implements LifecycleEventListener, NotificationReceivedHandler, NotificationOpenedHandler {
    public static final String HIDDEN_MESSAGE_KEY = "hidden";
 
    private ReactApplicationContext mReactApplicationContext;
    private ReactContext mReactContext;
    private boolean oneSignalInitDone;
    private boolean registeredEvents = false;
 
+   private OSNotificationOpenResult coldStartNotificationResult;
+   private boolean setNotificationOpenedHandler = false;
+   private boolean didSetRequiresPrivacyConsent = false;
+   private boolean waitingForUserPrivacyConsent = false;
+
    //ensure only one callback exists at a given time due to react-native restriction
    private Callback pendingGetTagsCallback;
 
@@ -81,19 +88,12 @@ private void initOneSignal() {
       // Uncomment to debug init issues.
       // OneSignal.setLogLevel(OneSignal.LOG_LEVEL.VERBOSE, OneSignal.LOG_LEVEL.ERROR);
 
-      if (!registeredEvents) {
-         registeredEvents = true;
-         registerNotificationsOpenedNotification();
-         registerNotificationsReceivedNotification();
-      }
-
       OneSignal.sdkType = "react";
 
       String appId = appIdFromManifest(mReactApplicationContext);
 
-      if (appId != null && appId.length() > 0) {
+      if (appId != null && appId.length() > 0)
          init(appId);
-      }
    }
 
    private void sendEvent(String eventName, Object params) {
@@ -125,12 +125,10 @@ public void init(String appId) {
          context = mReactApplicationContext.getApplicationContext();
       }
 
-      OneSignal.init(context,
-              null,
-              appId,
-              new NotificationOpenedHandler(mReactContext),
-              new NotificationReceivedHandler(mReactContext)
-      );
+      OneSignal.init(context, null, appId, this, this);
+
+      if (this.didSetRequiresPrivacyConsent)
+         this.waitingForUserPrivacyConsent = true;
    }
 
    @ReactMethod
@@ -389,51 +387,26 @@ public void userProvidedPrivacyConsent(Promise promise) {
       promise.resolve(OneSignal.userProvidedPrivacyConsent());
    }
 
-   @ReactMethod
-   public void setExternalUserId(String externalId) {
-      OneSignal.setExternalUserId(externalId);
-   }
-
-   @ReactMethod
-   public void removeExternalUserId() {
-      OneSignal.removeExternalUserId();
-   }
-
-   private void registerNotificationsReceivedNotification() {
-      IntentFilter intentFilter = new IntentFilter(NOTIFICATION_RECEIVED_INTENT_FILTER);
-      mReactContext.registerReceiver(new BroadcastReceiver() {
-         @Override
-         public void onReceive(Context context, Intent intent) {
-               notifyNotificationReceived(intent.getExtras());
-         }
-      }, intentFilter);
-   }
-
-   private void registerNotificationsOpenedNotification() {
-      IntentFilter intentFilter = new IntentFilter(NOTIFICATION_OPENED_INTENT_FILTER);
-      mReactContext.registerReceiver(new BroadcastReceiver() {
-         @Override
-         public void onReceive(Context context, Intent intent) {
-               notifyNotificationOpened(intent.getExtras());
-         }
-      }, intentFilter);
+   @Override
+   public void notificationReceived(OSNotification notification) {
+      this.sendEvent("OneSignal-remoteNotificationReceived", RNUtils.jsonToWritableMap(notification.toJSONObject()));
    }
 
-   private void notifyNotificationReceived(Bundle bundle) {
-      try {
-         JSONObject jsonObject = new JSONObject(bundle.getString("notification"));
-         sendEvent("OneSignal-remoteNotificationReceived", RNUtils.jsonToWritableMap(jsonObject));
-      } catch(Throwable t) {
-         t.printStackTrace();
+   @Override
+   public void notificationOpened(OSNotificationOpenResult result) {
+      if (!this.setNotificationOpenedHandler) {
+         this.coldStartNotificationResult = result;
+         return;
       }
+      this.sendEvent("OneSignal-remoteNotificationOpened", RNUtils.jsonToWritableMap(result.toJSONObject()));
    }
 
-   private void notifyNotificationOpened(Bundle bundle) {
-      try {
-         JSONObject jsonObject = new JSONObject(bundle.getString("result"));
-         sendEvent("OneSignal-remoteNotificationOpened",  RNUtils.jsonToWritableMap(jsonObject));
-      } catch(Throwable t) {
-         t.printStackTrace();
+   @ReactMethod
+   public void didSetNotificationOpenedHandler() {
+      this.setNotificationOpenedHandler = true;
+      if (this.coldStartNotificationResult != null) {
+         this.notificationOpened(this.coldStartNotificationResult);
+         this.coldStartNotificationResult = null;
       }
    }
 
@@ -443,10 +416,7 @@ public String getName() {
    }
 
    @Override
-   public void onHostDestroy() {
-      OneSignal.removeNotificationOpenedHandler();
-      OneSignal.removeNotificationReceivedHandler();
-   }
+   public void onHostDestroy() { }
 
    @Override
    public void onHostPause() {

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

@@ -53,7 +53,7 @@ function checkIfInitialized() {
 }
 
 export default class OneSignal {
-    static addEventListener(type: any, handler: Function) {
+    static addEventListener(type, handler) {
         if (!checkIfInitialized()) return;
 
         // Listen to events of notification received, opened, device registered and IDSAvailable.
@@ -65,6 +65,10 @@ export default class OneSignal {
 
         _notificationHandler.set(type, handler);
 
+        if (type == 'opened') {
+            RNOneSignal.didSetNotificationOpenedHandler();
+        }
+
         // Check if there is a cache for this type of event
         var cache = _notificationCache.get(type);
         if (handler && cache) {
@@ -102,7 +106,7 @@ export default class OneSignal {
         }
     }
 
-    static promptForPushNotificationsWithUserResponse(callback: Function) {
+    static promptForPushNotificationsWithUserResponse(callback) {
         if (!checkIfInitialized()) return;
 
         if (Platform.OS === 'ios') {
@@ -156,7 +160,7 @@ export default class OneSignal {
         }
     }
 
-    static checkPermissions(callback: Function) {
+    static checkPermissions(callback) {
         if (!checkIfInitialized()) return;
 
         if (Platform.OS === 'ios') {
@@ -180,7 +184,7 @@ export default class OneSignal {
         }
     }
 
-    static getPermissionSubscriptionState(callback: Function) {
+    static getPermissionSubscriptionState(callback) {
         if (!checkIfInitialized()) return;
 
         invariant(