Cleaning up old iOS categories and various fixes

Author: emawby

ios/Classes/OSFlutterCategories.h

@@ -47,20 +47,20 @@
 - (NSDictionary *)toJson;
 @end
 
-@interface OSNotificationOpenedResult (Flutter)
+@interface OSInAppMessage (Flutter)
 - (NSDictionary *)toJson;
 @end
 
-@interface OSInAppMessageAction (Flutter)
-- (NSDictionary *)toJson;
+@interface NSError (Flutter)
+- (FlutterError *)flutterError;
 @end
 
-@interface OSInAppMessage (Flutter)
+@interface OSInAppMessageWillDisplayEvent (Flutter)
 - (NSDictionary *)toJson;
 @end
 
-@interface NSError (Flutter)
-- (FlutterError *)flutterError;
+@interface OSInAppMessageDidDisplayEvent (Flutter)
+- (NSDictionary *)toJson;
 @end
 
 @interface OSInAppMessageWillDismissEvent (Flutter)

ios/Classes/OSFlutterCategories.m

@@ -73,17 +73,6 @@ - (NSDictionary *)toJson {
 }
 @end
 
-@implementation OSNotificationOpenedResult (Flutter)
-- (NSDictionary *)toJson {
-    NSMutableDictionary *json = [NSMutableDictionary new];
-
-    if (self.notification) json[@"notification"] = self.notification.toJson;
-    if (self.action.actionId) json[@"action"] = @{@"type" : @((int)self.action.type), @"id" : self.action.actionId};
-
-    return json;
-}
-@end
-
 @implementation OSNotificationClickEvent (Flutter)
 - (NSDictionary *)toJson {
     NSMutableDictionary *json = [NSMutableDictionary new];

ios/Classes/OSFlutterInAppMessages.h

@@ -35,11 +35,4 @@
 @property (strong, nonatomic) FlutterMethodChannel *channel;
 + (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
-*/
-@property (strong, nonatomic) OSInAppMessageAction *inAppMessageClickedResult;
-
 @end

ios/Classes/OSFlutterInAppMessages.m

@@ -101,7 +101,7 @@ - (void)paused:(FlutterMethodCall *)call withResult:(FlutterResult)result {
 }
 
 - (void)lifecycleInit:(FlutterMethodCall *)call withResult:(FlutterResult)result {
-    [OneSignal.InAppMessages addClickListener:OSFlutterInAppMessages.sharedInstance]
+    [OneSignal.InAppMessages addClickListener:OSFlutterInAppMessages.sharedInstance];
     [OneSignal.InAppMessages addLifecycleListener:OSFlutterInAppMessages.sharedInstance];
 }
 

ios/Classes/OSFlutterLiveActivities.m

@@ -53,7 +53,7 @@ - (void)enterLiveActivity:(FlutterMethodCall *)call withResult:(FlutterResult)re
     NSString *activityId = call.arguments[@"activityId"];
     NSString *token = call.arguments[@"token"];
 
-    [OneSignal enterLiveActivity:activityId withToken:token withSuccess:^(NSDictionary *results) {
+    [OneSignal.LiveActivities enter:activityId withToken:token withSuccess:^(NSDictionary *results) {
         result(results);
     } withFailure:^(NSError *error) {
         result(error.flutterError);
@@ -63,7 +63,7 @@ - (void)enterLiveActivity:(FlutterMethodCall *)call withResult:(FlutterResult)re
 - (void)exitLiveActivity:(FlutterMethodCall *)call withResult:(FlutterResult)result {
     NSString *activityId = call.arguments[@"activityId"];
 
-    [OneSignal exitLiveActivity:activityId withSuccess:^(NSDictionary *results) {
+    [OneSignal.LiveActivities exit:activityId withSuccess:^(NSDictionary *results) {
         result(results);
     } withFailure:^(NSError *error) {
         result(error.flutterError);

ios/Classes/OSFlutterNotifications.m

@@ -99,7 +99,7 @@ - (void)registerForProvisionalAuthorization:(FlutterMethodCall *)call withResult
 }
 
 - (void)lifecycleInit:(FlutterMethodCall *)call withResult:(FlutterResult)result {
-    [OneSignal.Notifications addLifecycleListener:self];
+    [OneSignal.Notifications addForegroundLifecycleListener:self];
     [OneSignal.Notifications addClickListener:self];
     [OneSignal.Notifications addPermissionObserver:self];
     result(nil);