Merge pull request #524 from geektimecoil/misc_fixes

Fix Android Create Notification Issue

Author: Nightsd01

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

@@ -304,7 +304,7 @@ public void setLocationShared(Boolean shared) {
    public void postNotification(String contents, String data, String playerId, String otherParameters) {
       try {
          JSONObject postNotification = new JSONObject();
-         postNotification.put("contents", contents);
+         postNotification.put("contents", new JSONObject(contents));
 
          if (playerId != null) {
             JSONArray playerIds = new JSONArray();
@@ -314,7 +314,7 @@ public void postNotification(String contents, String data, String playerId, Stri
 
          if (data != null) {
             JSONObject additionalData = new JSONObject();
-            additionalData.put("p2p_notification", data);
+            additionalData.put("p2p_notification", new JSONObject(data));
             postNotification.put("data", additionalData);
          }
 

ios/RCTOneSignal.xcodeproj/project.pbxproj

@@ -16,6 +16,7 @@
 		CA3D8B5B2076D84E006F3572 /* RCTOneSignalExtensionService.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = CA1CC866200FE3C3005B66AA /* RCTOneSignalExtensionService.h */; };
 		CA63F32E20ACFD60009AE90F /* UIApplication+RCTOnesignal.m in Sources */ = {isa = PBXBuildFile; fileRef = CA63F32C20ACFD60009AE90F /* UIApplication+RCTOnesignal.m */; };
 		CACB39D6202D232A00D86CD1 /* RCTOneSignalEventEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = CACB39D5202D232A00D86CD1 /* RCTOneSignalEventEmitter.m */; };
+		CACDD98820B3448B002A6C38 /* OneSignal.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = CA362AF6209927E20095B77A /* OneSignal.h */; };
 		FD2CCC851C772B4200B2B24E /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FD2CCC841C772B4200B2B24E /* SystemConfiguration.framework */; };
 		FDB40CC41C5E4E5500CBF09B /* RCTOneSignal.m in Sources */ = {isa = PBXBuildFile; fileRef = FDB40CC31C5E4E5500CBF09B /* RCTOneSignal.m */; };
 /* End PBXBuildFile section */
@@ -27,6 +28,7 @@
 			dstPath = "include/$(PRODUCT_NAME)";
 			dstSubfolderSpec = 16;
 			files = (
+				CACDD98820B3448B002A6C38 /* OneSignal.h in Copy Headers */,
 				CA3D8B5A2076D84E006F3572 /* RCTOneSignal.h in Copy Headers */,
 				CA3D8B5B2076D84E006F3572 /* RCTOneSignalExtensionService.h in Copy Headers */,
 			);

ios/RCTOneSignal/RCTOneSignal.h

@@ -11,6 +11,8 @@
 
 + (RCTOneSignal *) sharedInstance;
 
+@property (nonatomic) BOOL didStartObserving;
+
 - (void)configureWithAppId:(NSString *)appId;
 - (void)configureWithAppId:(NSString *)appId settings:(NSDictionary*)settings;
 

ios/RCTOneSignal/RCTOneSignal.m

@@ -27,7 +27,6 @@ @interface RCTOneSignal ()
 @end
 
 @implementation RCTOneSignal {
-    BOOL didStartObserving;
     BOOL didInitialize;
 }
 
@@ -44,12 +43,12 @@ + (RCTOneSignal *) sharedInstance {
 
 - (void)initOneSignal {
     [OneSignal setValue:@"react" forKey:@"mSDKType"];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didStartObserving) name:@"didSetBridge" object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didBeginObserving) name:@"didSetBridge" object:nil];
 
     [OneSignal initWithLaunchOptions:nil appId:nil handleNotificationReceived:^(OSNotification* notification) {
         [self handleRemoteNotificationReceived:[notification stringify]];
     } handleNotificationAction:^(OSNotificationOpenedResult *result) {
-        if (!didStartObserving)
+        if (!RCTOneSignal.sharedInstance.didStartObserving)
             coldStartOSNotificationOpenedResult = result;
         else
             [self handleRemoteNotificationOpened:[result stringify]];
@@ -70,8 +69,10 @@ - (id)initWithLaunchOptions:(NSDictionary *)launchOptions appId:(NSString *)appI
     return self;
 }
 
-- (void)didStartObserving {
-    didStartObserving = true;
+- (void)didBeginObserving {
+    // To continue supporting deprecated initialization methods (which create a new RCTOneSignal instance),
+    // we will only access the didStartObserving property of the shared instance to avoid issues
+    RCTOneSignal.sharedInstance.didStartObserving = true;
 
     dispatch_async(dispatch_get_main_queue(), ^{
         if (coldStartOSNotificationOpenedResult) {
@@ -103,7 +104,7 @@ - (void)configureWithAppId:(NSString *)appId settings:(NSDictionary*)settings {
               [self handleRemoteNotificationReceived:[notification stringify]];
           }
           handleNotificationAction:^(OSNotificationOpenedResult *result) {
-              if (!didStartObserving)
+              if (!RCTOneSignal.sharedInstance.didStartObserving)
                   coldStartOSNotificationOpenedResult = result;
               else
                   [self handleRemoteNotificationOpened:[result stringify]];