Registering staticInstances to make handlers function properly

Author: fhboswell

example/lib/main.dart

@@ -69,7 +69,7 @@ class _MyAppState extends State<MyApp> with OneSignalPushSubscriptionObserver {
       });
     });  
 
-    OneSignal.InAppMessages.pause(false);
+    OneSignal.InAppMessages.paused(false);
 
     OneSignal.InAppMessages
         .setInAppMessageClickedHandler((OSInAppMessageAction action) {

ios/Classes/OSFlutterInAppMessages.h

@@ -33,8 +33,9 @@
 @interface OSFlutterInAppMessages : NSObject<FlutterPlugin, OSInAppMessageLifecycleHandler>
 
 @property (strong, nonatomic) FlutterMethodChannel *channel;
-@property (atomic) BOOL hasSetInAppMessageClickedHandler;
++ (instancetype)sharedInstance;
 
+@property (atomic) BOOL hasSetInAppMessageClickedHandler;
 /*
     Holds reference to any in app messages received before any click action
     occurs on the body, button or image elements of the in app message

ios/Classes/OSFlutterInAppMessages.m

@@ -25,7 +25,7 @@
  * THE SOFTWARE.
  */
 
-#import "OSFlutterDebug.h"
+#import "OSFlutterInAppMessages.h"
 #import <OneSignalFramework/OneSignalFramework.h>
 #import "OSFlutterCategories.h"
 
@@ -42,17 +42,17 @@ + (instancetype)sharedInstance {
 }
 
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
-    OSFlutterInAppMessages *instance = [OSFlutterInAppMessages new];
-
-    instance.channel = [FlutterMethodChannel
+   
+    OSFlutterInAppMessages.sharedInstance.channel = [FlutterMethodChannel
                         methodChannelWithName:@"OneSignal#inappmessages"
                         binaryMessenger:[registrar messenger]];
 
-    [registrar addMethodCallDelegate:instance channel:instance.channel];
+    [registrar addMethodCallDelegate:OSFlutterInAppMessages.sharedInstance channel:OSFlutterInAppMessages.sharedInstance.channel];
 
-    [OneSignal.InAppMessages setLifecycleHandler:^(OSInAppMessageAction *action) {
-         [self handleInAppMessageClicked:action];
+    [OneSignal.InAppMessages setClickHandler:^(OSInAppMessageAction *action) {
+         [OSFlutterInAppMessages.sharedInstance handleInAppMessageClicked:action];
      }];
+     [OneSignal.InAppMessages setLifecycleHandler:OSFlutterInAppMessages.sharedInstance];
 }
 
 - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result {
@@ -65,14 +65,15 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     } else if ([@"OneSignal#removeTriggers" isEqualToString:call.method]) {
         [self removeTriggers:call withResult:result];
     } else if ([@"OneSignal#clearTriggers" isEqualToString:call.method]) {
-        result([OneSignal clearTriggers:call.arguments]);
+          [self clearTriggers:call withResult:result];
     } else if ([@"OneSignal#paused" isEqualToString:call.method]) {
         [self paused:call withResult:result];
     } else if ([@"OneSignal#arePaused" isEqualToString:call.method]) {
-        result(@([OneSignal paused];))
-    } else if ([@"OneSignal#initInAppMessageClickedHandlerParams" isEqualToString:call.method])
-        [self initInAppMessageClickedHandlerParams];{
-    else
+        result(@([OneSignal.InAppMessages paused]));
+    } else if ([@"OneSignal#initInAppMessageClickedHandlerParams" isEqualToString:call.method]) {
+        [self initInAppMessageClickedHandlerParams];
+    }
+    else{
         result(FlutterMethodNotImplemented);
     }
 }
@@ -91,7 +92,7 @@ - (void)removeTrigger:(FlutterMethodCall *)call withResult:(FlutterResult)result
 
 - (void)removeTriggers:(FlutterMethodCall *)call withResult:(FlutterResult)result {
     NSArray *keys = call.arguments;
-    [OneSignal.InAppMessages removeTriggersForKeys:keys];
+    [OneSignal.InAppMessages removeTriggers:keys];
     result(nil);
 }
 

ios/Classes/OSFlutterNotifications.h

@@ -33,9 +33,10 @@
 @interface OSFlutterNotifications : NSObject<FlutterPlugin, OSPermissionObserver>
 
 @property (strong, nonatomic) FlutterMethodChannel *channel;
-
++ (instancetype)sharedInstance;
 @property (atomic) BOOL hasSetNotificationWillShowInForegroundHandler;
 @property (strong, nonatomic) NSMutableDictionary* notificationCompletionCache;
 @property (strong, nonatomic) NSMutableDictionary* receivedNotificationCache;
 
+
 @end

ios/Classes/OSFlutterNotifications.m

@@ -45,13 +45,13 @@ + (instancetype)sharedInstance {
 }
 
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
-    OSFlutterNotifications *instance = [OSFlutterNotifications new];
+    //OSFlutterNotifications *instance = [OSFlutterNotifications new];
 
-    instance.channel = [FlutterMethodChannel
+    OSFlutterNotifications.sharedInstance.channel = [FlutterMethodChannel
                         methodChannelWithName:@"OneSignal#notifications"
                         binaryMessenger:[registrar messenger]];
 
-    [registrar addMethodCallDelegate:instance channel:instance.channel];
+    [registrar addMethodCallDelegate:OSFlutterNotifications.sharedInstance channel:OSFlutterNotifications.sharedInstance.channel];
 
     [OneSignal.Notifications setNotificationWillShowInForegroundHandler:^(OSNotification *notification, OSNotificationDisplayResponse completion) {
         [OSFlutterNotifications.sharedInstance handleNotificationWillShowInForeground:notification completion:completion];
@@ -122,15 +122,17 @@ - (void)removePermissionObserver:(FlutterMethodCall *)call withResult:(FlutterRe
 #pragma mark Received in Foreground Notification 
 
 - (void)initNotificationWillShowInForegroundHandlerParams {
+    NSLog(@"hasSetNotificationWillShowInForegroundHandler1");
     self.hasSetNotificationWillShowInForegroundHandler = YES;
 }
 
 - (void)handleNotificationWillShowInForeground:(OSNotification *)notification completion:(OSNotificationDisplayResponse)completion {
+    NSLog(@"Notification will show in foreground1");
     if (!self.hasSetNotificationWillShowInForegroundHandler) {
         completion(notification);
         return;
     }
-
+   NSLog(@"Notification will show in foreground2");
     self.receivedNotificationCache[notification.notificationId] = notification;
     self.notificationCompletionCache[notification.notificationId] = completion;
     [self.channel invokeMethod:@"OneSignal#handleNotificationWillShowInForeground" arguments:notification.toJson];
@@ -167,6 +169,7 @@ - (void)initNotificationOpenedHandlerParams {
 }
 
 - (void)handleNotificationOpened:(OSNotificationOpenedResult *)result {
+     
     [self.channel invokeMethod:@"OneSignal#handleOpenedNotification" arguments:result.toJson];
 }
 

ios/Classes/OneSignalPlugin.m

@@ -32,6 +32,7 @@
 #import "OSFlutterNotifications.h"
 #import "OSFlutterSession.h"
 #import "OSFlutterLocation.h"
+#import "OSFlutterInAppMessages.h"
 
 
 @interface OneSignalPlugin ()
@@ -64,7 +65,7 @@ + (instancetype)sharedInstance {
 #pragma mark FlutterPlugin
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
 
-    // [OneSignal setMSDKType:@"flutter"];
+    [OneSignal setMSDKType:@"flutter"];
 
     OneSignalPlugin.sharedInstance.channel = [FlutterMethodChannel
                                      methodChannelWithName:@"OneSignal"
@@ -76,6 +77,7 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
     [OSFlutterNotifications registerWithRegistrar:registrar];
     [OSFlutterSession registerWithRegistrar:registrar];
     [OSFlutterLocation registerWithRegistrar:registrar];
+    [OSFlutterInAppMessages registerWithRegistrar:registrar];
 
 }
 

lib/src/inappmessages.dart

@@ -58,8 +58,8 @@ class OneSignalInAppMessages {
   }
 
   /// Toggles the showing of all in app messages
-  Future<void> pause(bool pause) async {
-    return await _channel.invokeMethod("OneSignal#pause", pause);
+  Future<void> paused(bool pause) async {
+    return await _channel.invokeMethod("OneSignal#paused", pause);
   }
 
    /// Gets whether of not in app messages are paused

lib/src/notifications.dart

@@ -87,9 +87,7 @@ class OneSignalNotifications {
   }
 
   Future<void> onOSPermissionChangedHandler(OSPermissionState state) async {
-    print("onOSPermissionChanged update in flutter");
     for (var observer in _observers) {
-       print("onOSPermissionChanged fired");
       observer.onOSPermissionChanged(state);
     }
   }