Calling back from android to flutter to run blocks

Author: fhboswell

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

@@ -23,17 +23,14 @@ public class OneSignalInAppMessages extends FlutterRegistrarResponder implements
     private IInAppMessageClickResult inAppMessageClickedResult;
     private boolean hasSetInAppMessageClickedHandler = false;
 
-    private static final OneSignalInAppMessages sharedInstance = new OneSignalInAppMessages();
+    
 
     static void registerWith(BinaryMessenger messenger) {
-      
+        OneSignalInAppMessages sharedInstance = new OneSignalInAppMessages();
+       
         sharedInstance.messenger = messenger;
         sharedInstance.channel = new MethodChannel(messenger, "OneSignal#inappmessages");
-        sharedInstance.channel.setMethodCallHandler(sharedInstance);
-
-
-        OneSignalInAppMessages.sharedInstance.setInAppMessageLifecycleHandler();
-        OneSignal.getInAppMessages().setInAppMessageClickHandler(null);
+        sharedInstance.channel.setMethodCallHandler(sharedInstance);   
     }
 
     @Override
@@ -52,6 +49,8 @@ else if (call.method.contentEquals("OneSignal#paused"))
             this.paused(call, result);
         else if (call.method.contentEquals("OneSignal#initInAppMessageClickedHandlerParams"))
             this.initInAppMessageClickedHandlerParams();
+        else if (call.method.contentEquals("OneSignal#lifecycleInit"))
+            this.lifecycleInit();
         else
             replyNotImplemented(result);
     }
@@ -96,36 +95,41 @@ private void initInAppMessageClickedHandlerParams() {
         }
       }
 
+    public void lifecycleInit() {
+        this.setInAppMessageLifecycleHandler();
+        OneSignal.getInAppMessages().setInAppMessageClickHandler(this);
+    }
+
     public void inAppMessageClicked(IInAppMessageClickResult action) {
-        if (!OneSignalInAppMessages.sharedInstance.hasSetInAppMessageClickedHandler) {
-            OneSignalInAppMessages.sharedInstance.inAppMessageClickedResult = action;
+        if (!this.hasSetInAppMessageClickedHandler) {
+            this.inAppMessageClickedResult = action;
         return;
         }
 
-        invokeMethodOnUiThread("OneSignal#handleClickedInAppMessage", OneSignalSerializer.convertInAppMessageClickedActionToMap(action));
+        channel.invokeMethod("OneSignal#handleClickedInAppMessage", OneSignalSerializer.convertInAppMessageClickedActionToMap(action));
     }
 
     /* in app message lifecycle */
     public void setInAppMessageLifecycleHandler() {
         OneSignal.getInAppMessages().setInAppMessageLifecycleHandler(new IInAppMessageLifecycleHandler() {
             @Override
             public void onWillDisplayInAppMessage(IInAppMessage message) { 
-            invokeMethodOnUiThread("OneSignal#onWillDisplayInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
+                channel.invokeMethod("OneSignal#onWillDisplayInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
             }
 
             @Override
             public void onDidDisplayInAppMessage(IInAppMessage message) {
-            invokeMethodOnUiThread("OneSignal#onDidDisplayInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
+                channel.invokeMethod("OneSignal#onDidDisplayInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
             }
 
             @Override
             public void onWillDismissInAppMessage(IInAppMessage message) {
-            invokeMethodOnUiThread("OneSignal#onWillDismissInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
+                channel.invokeMethod("OneSignal#onWillDismissInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
             }
 
             @Override
             public void onDidDismissInAppMessage(IInAppMessage message) {
-            invokeMethodOnUiThread("OneSignal#onDidDismissInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
+                channel.invokeMethod("OneSignal#onDidDismissInAppMessage", OneSignalSerializer.convertInAppMessageToMap(message));
             }
         });
   }

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

@@ -36,7 +36,7 @@ public OneSignalPlugin() {
   }
 
   private void init(Context context, BinaryMessenger messenger)
-  {
+  { 
     this.context = context;
     this.messenger = messenger;
 
@@ -119,7 +119,6 @@ public void onMethodCall(MethodCall call, Result result) {
   private void initWithContext(MethodCall call, Result reply) {
     String appId = call.argument("appId");
     OneSignal.initWithContext(context, appId);
-   
     // if (hasSetRequiresPrivacyConsent && !OneSignal.userProvidedPrivacyConsent())
     //   this.waitingForUserPrivacyConsent = true;
     // else

example/lib/main.dart

@@ -302,14 +302,14 @@ class _MyAppState extends State<MyApp> with OneSignalPushSubscriptionObserver {
   }
 
   oneSignalOutcomeExamples() async {
-    // OneSignal.Session.addOutcome("normal_1");
-    // OneSignal.Session.addOutcome("normal_2");
+    OneSignal.Session.addOutcome("normal_1");
+    OneSignal.Session.addOutcome("normal_2");
 
-    // OneSignal.Session.addUniqueOutcome("unique_1");
-    // OneSignal.Session.addUniqueOutcome("unique_2");
+    OneSignal.Session.addUniqueOutcome("unique_1");
+    OneSignal.Session.addUniqueOutcome("unique_2");
 
-    // OneSignal.Session.addOutcomeWithValue("value_1", 3.2);
-    // OneSignal.Session.addOutcomeWithValue("value_2", 3.9);
+    OneSignal.Session.addOutcomeWithValue("value_1", 3.2);
+    OneSignal.Session.addOutcomeWithValue("value_2", 3.9);
   }
 
   void _handleOptIn() {

lib/onesignal_flutter.dart

@@ -30,53 +30,49 @@ class OneSignal {
   static OneSignalSession Session = new OneSignalSession();
   static OneSignalLocation Location = new OneSignalLocation();
   static OneSignalInAppMessages InAppMessages = new OneSignalInAppMessages();
-  
 
   // private channels used to bridge to ObjC/Java
   MethodChannel _channel = const MethodChannel('OneSignal');
- 
-  /// The initializer for OneSignal. 
+
+  /// The initializer for OneSignal.
   ///
-  /// The initializer accepts an [appId] which the developer can get 
+  /// The initializer accepts an [appId] which the developer can get
   /// from the OneSignal consoleas well as a dictonary of [launchOptions]
   void initialize(String appId) {
-    _channel.invokeMethod(
-        'OneSignal#initialize', {'appId': appId});
+    _channel.invokeMethod('OneSignal#initialize', {'appId': appId});
+    InAppMessages.lifecycleInit();
   }
 
-  /// Login to OneSignal under the user identified by the [externalId] provided. 
-  /// 
-  /// The act of logging a user into the OneSignal SDK will switch the 
+  /// Login to OneSignal under the user identified by the [externalId] provided.
+  ///
+  /// The act of logging a user into the OneSignal SDK will switch the
   /// [user] context to that specific user.
   void login(String externalId) {
-    _channel.invokeMethod(
-        'OneSignal#login', {'externalId': externalId});
+    _channel.invokeMethod('OneSignal#login', {'externalId': externalId});
   }
 
-  /// Logout the user previously logged in via [login]. The [user] property now 
+  /// Logout the user previously logged in via [login]. The [user] property now
   ///
-  /// references a new device-scoped user. A device-scoped user has no user identity 
-  /// that can later be retrieved, except through this device as long as the app 
+  /// references a new device-scoped user. A device-scoped user has no user identity
+  /// that can later be retrieved, except through this device as long as the app
   /// remains installed and the app data is not cleared.
   void logout() {
-    _channel.invokeMethod(
-        'OneSignal#logout');
+    _channel.invokeMethod('OneSignal#logout');
   }
 
-  /// Indicates whether privacy consent has been granted. 
+  /// Indicates whether privacy consent has been granted.
   ///
-  /// This field is only relevant when the application has 
+  /// This field is only relevant when the application has
   /// opted into data privacy protections. See [requiresPrivacyConsent].
   Future<bool> getPrivacyConsent() async {
-    var val =
-        await _channel.invokeMethod("OneSignal#getPrivacyConsent");
+    var val = await _channel.invokeMethod("OneSignal#getPrivacyConsent");
 
     return val as bool;
   }
 
   /// Sets the whether or not privacy consent has been [granted]
   ///
-  /// This field is only relevant when the application has 
+  /// This field is only relevant when the application has
   /// opted into data privacy protections. See [requiresPrivacyConsent].
   Future<void> setPrivacyConsent(bool granted) async {
     await _channel
@@ -87,8 +83,7 @@ class OneSignal {
   /// user's consent before it can initialize (if you set the app to
   /// require the user's consent)
   Future<bool> requiresPrivacyConsent() async {
-    var val =
-        await _channel.invokeMethod("OneSignal#requiresPrivacyConsent");
+    var val = await _channel.invokeMethod("OneSignal#requiresPrivacyConsent");
 
     return val as bool;
   }
@@ -102,8 +97,8 @@ class OneSignal {
   }
 
   /// This method can be used to set if launch URLs should be opened in safari or
-  /// within the application. Set to true to launch all notifications with a URL 
-  /// in the app instead of the default web browser. Make sure to call setLaunchURLsInApp 
+  /// within the application. Set to true to launch all notifications with a URL
+  /// in the app instead of the default web browser. Make sure to call setLaunchURLsInApp
   /// before the initialize call.
   void setLaunchURLsInApp(bool launchUrlsInApp) {
     _channel.invokeMethod(
@@ -114,17 +109,17 @@ class OneSignal {
   /// Associates a temporary push token with an Activity ID on the OneSignal server.
   Future<void> enterLiveActivity(String activityId, String token) async {
     if (Platform.isIOS) {
-      await _channel.invokeMethod("OneSignal#enterLiveActivity", {'activityId': activityId, 'token': token});
-    } 
+      await _channel.invokeMethod("OneSignal#enterLiveActivity",
+          {'activityId': activityId, 'token': token});
+    }
   }
 
   /// Only applies to iOS
   /// Deletes activityId associated temporary push token on the OneSignal server.
   Future<void> exitLiveActivity(String activityId) async {
     if (Platform.isIOS) {
-      await _channel.invokeMethod("OneSignal#exitLiveActivity",
-        {'activityId': activityId});
+      await _channel.invokeMethod(
+          "OneSignal#exitLiveActivity", {'activityId': activityId});
     }
   }
-
 }

lib/src/inappmessages.dart

@@ -11,27 +11,24 @@ typedef void OnWillDismissInAppMessageHandler(OSInAppMessage message);
 typedef void OnDidDismissInAppMessageHandler(OSInAppMessage message);
 
 class OneSignalInAppMessages {
-
   // private channels used to bridge to ObjC/Java
   MethodChannel _channel = const MethodChannel('OneSignal#inappmessages');
 
-
   // constructor method
   OneSignalInAppMessages() {
     this._channel.setMethodCallHandler(_handleMethod);
   }
 
-
   InAppMessageClickedHandler? _onInAppMessageClickedHandler;
   OnWillDisplayInAppMessageHandler? _onWillDisplayInAppMessageHandler;
   OnDidDisplayInAppMessageHandler? _onDidDisplayInAppMessageHandler;
   OnWillDismissInAppMessageHandler? _onWillDismissInAppMessageHandler;
   OnDidDismissInAppMessageHandler? _onDidDismissInAppMessageHandler;
 
-   /// Adds a single key, value trigger, which will trigger an in app message
+  /// Adds a single key, value trigger, which will trigger an in app message
   /// if one exists matching the specific trigger added
   Future<void> addTrigger(String key, Object value) async {
-    return await _channel.invokeMethod("OneSignal#addTrigger", {key : value});
+    return await _channel.invokeMethod("OneSignal#addTrigger", {key: value});
   }
 
   /// Adds one or more key, value triggers, which will trigger in app messages
@@ -62,11 +59,14 @@ class OneSignalInAppMessages {
     return await _channel.invokeMethod("OneSignal#paused", pause);
   }
 
-   /// Gets whether of not in app messages are paused
+  /// Gets whether of not in app messages are paused
   Future<bool> arePaused() async {
     return await _channel.invokeMethod("OneSignal#arePaused");
   }
-  
+
+  Future<bool> lifecycleInit() async {
+    return await _channel.invokeMethod("OneSignal#lifecycleInit");
+  }
 
   // Private function that gets called by ObjC/Java
   Future<Null> _handleMethod(MethodCall call) async {
@@ -90,7 +90,7 @@ class OneSignalInAppMessages {
         this._onDidDismissInAppMessageHandler != null) {
       this._onDidDismissInAppMessageHandler!(
           OSInAppMessage(call.arguments.cast<String, dynamic>()));
-    } 
+    }
     return null;
   }
 
@@ -128,5 +128,4 @@ class OneSignalInAppMessages {
       OnDidDismissInAppMessageHandler handler) {
     _onDidDismissInAppMessageHandler = handler;
   }
-
 }