Add getInitialNotification() on iOS

OneSignal · Sep 9, 2019 · ba0828a · ba0828a
1 parent 22f997d
commit ba0828a
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -478,4 +478,15 @@ export default class OneSignal {
         }
     }
 
+    static getInitialNotification() {
+        if (!checkIfInitialized()) return;
+
+        //returns a promise
+        if (Platform.OS === 'android') {
+            console.log("This function is not supported on Android");
+            return
+        }
+        return RNOneSignal.getInitialNotification();
+    }
+
 }
diff --git a/ios/RCTOneSignal/RCTOneSignal.m b/ios/RCTOneSignal/RCTOneSignal.m
@@ -76,8 +76,8 @@ - (void)didBeginObserving {
 
     dispatch_async(dispatch_get_main_queue(), ^{
         if (coldStartOSNotificationOpenedResult) {
-            [self handleRemoteNotificationOpened:[coldStartOSNotificationOpenedResult stringify]];
-            coldStartOSNotificationOpenedResult = nil;
+            NSDictionary *json = [self jsonObjectWithString:[coldStartOSNotificationOpenedResult stringify]];
+            [RCTOneSignalEventEmitter setInitialNotification:json];
         }
     });
 }

diff --git a/ios/RCTOneSignal/RCTOneSignalEventEmitter.h b/ios/RCTOneSignal/RCTOneSignalEventEmitter.h
@@ -26,6 +26,7 @@ typedef NS_ENUM(NSInteger, OSNotificationEventTypes) {
 @interface RCTOneSignalEventEmitter : RCTEventEmitter <RCTBridgeModule>
 
 + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body;
++ (void)setInitialNotification:(NSDictionary *)body;
 + (BOOL)hasSetBridge;
 
 @end
diff --git a/ios/RCTOneSignal/RCTOneSignalEventEmitter.m b/ios/RCTOneSignal/RCTOneSignalEventEmitter.m
@@ -33,6 +33,8 @@ +(BOOL)requiresMainQueueSetup {
 
 RCT_EXPORT_MODULE(RCTOneSignal)
 
+NSDictionary* initialNotification;
+
 #pragma mark RCTEventEmitter Subclass Methods
 
 -(instancetype)init {
@@ -85,6 +87,9 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
     [[NSNotificationCenter defaultCenter] postNotificationName:name object:nil userInfo:body];
 }
 
++ (void)setInitialNotification:(NSDictionary *)body {
+    initialNotification = body;
+}
 
 #pragma mark Exported Methods
 
@@ -350,6 +355,23 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
     [OneSignal setExternalUserId:externalId];
 }
 
+RCT_REMAP_METHOD(getInitialNotification,
+                 getInitialNotificationWithResolver:(RCTPromiseResolveBlock)resolve
+                 rejecter:(RCTPromiseRejectBlock)reject)
+{
+    if (initialNotification) {
+        resolve(initialNotification);
+    } else {
+        NSDictionary *userInfo = @{
+                                   NSLocalizedDescriptionKey: NSLocalizedString(@"No initial notification", nil),
+                                   NSLocalizedFailureReasonErrorKey: NSLocalizedString(@"Initial notification not found", nil)
+                                   };
+        NSError *error = [NSError errorWithDomain:@"RCTOneSignal" code:1 userInfo:userInfo];
+        reject(@"no_initial_notification", @"There was no notification on app opening", error);
+    }
+}
+
+
 RCT_EXPORT_METHOD(removeExternalUserId) {
     [OneSignal removeExternalUserId];
 }