Change Cold Start Notification Opened Logic

• If the user opens an app by tapping a notification, the native SDK would call the NotificationOpened handler before the Flutter channel has been configured
• On both the native Objective-C and Java plugins, added a property to hold the coldstart notification until the app adds the NotificationOpened handler
• Sets SDK type to 'flutter' in ObjC

Author: Nightsd01

android/src/main/java/com/onesignal/flutter/OneSignalPlugin.java

@@ -37,6 +37,8 @@ public class OneSignalPlugin implements MethodCallHandler, NotificationReceivedH
   private MethodChannel channel;
   private boolean didSetRequiresPrivacyConsent = false;
   private boolean waitingForUserPrivacyConsent = false;
+  private OSNotificationOpenResult coldStartNotificationResult;
+  private boolean setNotificationOpenedHandler = false;
 
   public static void registerWith(Registrar registrar) {
 
@@ -87,6 +89,10 @@ public void onMethodCall(MethodCall call, Result result) {
       this.setEmail(call, result);
     } else if (call.method.contentEquals("OneSignal#logoutEmail")) {
       this.logoutEmail(call, result);
+    } else if (call.method.contentEquals("OneSignal#promptPermission")) {
+      Log.e("onesignal", "promptPermission() is not applicable in Android.");
+    } else if (call.method.contentEquals("OneSignal#didSetNotificationOpenedHandler")) {
+      this.didSetNotificationOpenedHandler();
     } else {
       result.notImplemented();
     }
@@ -111,7 +117,6 @@ public void initOneSignal(MethodCall call, Result result) {
   }
 
   public void addObservers() {
-    Log.d("onesignal", "adding observers");
     OneSignal.addSubscriptionObserver(this);
     OneSignal.addEmailSubscriptionObserver(this);
     OneSignal.addPermissionObserver(this);
@@ -131,6 +136,12 @@ public void consentGranted(MethodCall call, Result result) {
     OneSignal.provideUserConsent((Boolean)args.get("granted"));
 
     result.success(null);
+
+    if (this.waitingForUserPrivacyConsent) {
+      this.waitingForUserPrivacyConsent = false;
+
+      this.addObservers();
+    }
   }
 
   public void setRequiresUserPrivacyConsent(MethodCall call, Result result) {
@@ -173,7 +184,11 @@ public void onFailure(JSONObject response) {
 
       @Override
       public void onSuccess(JSONObject response) {
-        reply.success(response);
+        try {
+          reply.success(OneSignalSerializer.convertJSONObjectToHashMap(response));
+        } catch (JSONException exception) {
+          Log.e("onesignal", "Encountered an error attempting to deserialize server response: " + exception.getMessage());
+        }
       }
     });
   }
@@ -229,6 +244,14 @@ private int inFocusDisplayOptionToInt(OSInFocusDisplayOption option) {
     return 1;
   }
 
+  public void didSetNotificationOpenedHandler() {
+    this.setNotificationOpenedHandler = true;
+    if (this.coldStartNotificationResult != null) {
+      this.notificationOpened(this.coldStartNotificationResult);
+      this.coldStartNotificationResult = null;
+    }
+  }
+
   @Override
   public void onOSSubscriptionChanged(OSSubscriptionStateChanges stateChanges) {
     Log.d("onesignal", "Subscription changed calling observer");
@@ -256,6 +279,12 @@ public void notificationReceived(OSNotification notification) {
 
   @Override
   public void notificationOpened(OSNotificationOpenResult result) {
+    if (!this.setNotificationOpenedHandler) {
+      this.coldStartNotificationResult = result;
+      return;
+    }
+
+    Log.d("onesignal", "OS Notification Opened");
     try {
       this.channel.invokeMethod("OneSignal#handleOpenedNotification", OneSignalSerializer.convertNotificationOpenResultToMap(result));
     } catch (JSONException exception) {

android/src/main/java/com/onesignal/flutter/OneSignalSerializer.java

@@ -111,13 +111,15 @@ static public HashMap<Object, Object> convertNotificationPayloadToMap(OSNotifica
 
         ArrayList<HashMap> buttons = new ArrayList<HashMap>();
 
-        for (int i = 0; i < payload.actionButtons.size(); i++) {
-            OSNotificationPayload.ActionButton button = payload.actionButtons.get(i);
-
-            HashMap buttonHash = new HashMap();
-            buttonHash.put("id", button.id);
-            buttonHash.put("text", button.text);
-            buttonHash.put("icon", button.icon);
+        if (payload.actionButtons != null) {
+            for (int i = 0; i < payload.actionButtons.size(); i++) {
+                OSNotificationPayload.ActionButton button = payload.actionButtons.get(i);
+
+                HashMap buttonHash = new HashMap();
+                buttonHash.put("id", button.id);
+                buttonHash.put("text", button.text);
+                buttonHash.put("icon", button.icon);
+            }
         }
 
         if (buttons.size() > 0)

example/lib/main.dart

@@ -163,10 +163,14 @@ class _MyAppState extends State<MyApp> {
 
     var playerId = status.subscriptionStatus.userId;
 
+    var imgUrlString = "http://cdn1-www.dogtime.com/assets/uploads/gallery/30-impossibly-cute-puppies/impossibly-cute-puppy-2.jpg";
+
     var notification = OSCreateNotification(
       playerIds: [playerId],
       content: "this is a test from OneSignal's Flutter SDK",
       heading: "Test Notification",
+      iosAttachments: {"id1" : imgUrlString},
+      bigPicture: imgUrlString,
       buttons: [
         OSActionButton(text: "test1", id: "id1"),
         OSActionButton(text: "test2", id: "id2")

ios/Classes/OneSignalPlugin.m

@@ -71,6 +71,8 @@ + (instancetype)sharedInstance
 #pragma mark FlutterPlugin
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
 
+    [OneSignal setMSDKType:@"flutter"];
+    
     // Wrapper SDK's call init with no app ID early on in the
     // app lifecycle. The developer will call init() later on
     // from the Flutter plugin channel.
@@ -122,6 +124,8 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
         [self setEmail:call withResult:result];
     } else if ([@"OneSignal#logoutEmail" isEqualToString:call.method]) {
         [self logoutEmail:call withResult:result];
+    } else if ([@"OneSignal#didSetNotificationOpenedHandler" isEqualToString:call.method]) {
+        [self didSetNotificationOpenedHandler];
     } else {
         result(FlutterMethodNotImplemented);
     }
@@ -144,19 +148,6 @@ - (void)initOneSignal:(FlutterMethodCall *)call withResult:(FlutterResult)result
         [self addObservers];
     }
 
-    //since the developer may add the NotificationOpened handler
-    //after they call OneSignal.init(), we delay this check to
-    //make sure the app has had enough time to reasonably add
-    //the NotificationOpened handler.
-    
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        @synchronized(self.coldStartOpenResult) {
-            if (self.coldStartOpenResult) {
-                [self handleNotificationOpened:self.coldStartOpenResult];
-            }
-        }
-    });
-    
     result(@[]);
 }
 
@@ -234,6 +225,13 @@ - (void)oneSignalLog:(FlutterMethodCall *)call withResult:(FlutterResult)result
     [OneSignal onesignal_Log:(ONE_S_LOG_LEVEL)[call.arguments[@"logLevel"] integerValue] message:(NSString *)call.arguments[@"message"]];
 }
 
+- (void)didSetNotificationOpenedHandler {
+    if (self.coldStartOpenResult) {
+        [self handleNotificationOpened:self.coldStartOpenResult];
+        self.coldStartOpenResult = nil;
+    }
+}
+
 #pragma mark Received & Opened Notification Handlers
 - (void)handleReceivedNotification:(OSNotification *)notification {
     [self.channel invokeMethod:@"OneSignal#handleReceivedNotification" arguments:notification.toJson ? notification.toJson : @[]];

lib/onesignal.dart

@@ -77,6 +77,7 @@ class OneSignal {
   /// OneSignal push notification, or taps an action button on a notification.
   void setNotificationOpenedHandler(OpenedNotificationHandler handler) {
     _onOpenedNotification = handler;
+    _channel.invokeMethod("OneSignal#didSetNotificationOpenedHandler");
   }
 
   /// The subscription handler will be called whenever the user's OneSignal