From 97161ef877cd32f9a420eb4a2011c91623e26916 Mon Sep 17 00:00:00 2001 From: Josh Kasten Date: Sat, 10 Apr 2021 00:55:39 -0700 Subject: [PATCH 1/4] Clean up iOS 7 and older check * OneSignal only support iOS 9 and newer --- ios/RCTOneSignal/RCTOneSignal.m | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ios/RCTOneSignal/RCTOneSignal.m b/ios/RCTOneSignal/RCTOneSignal.m index 53494473..68020597 100644 --- a/ios/RCTOneSignal/RCTOneSignal.m +++ b/ios/RCTOneSignal/RCTOneSignal.m @@ -13,16 +13,6 @@ #import "RCTOneSignal.h" #import "RCTOneSignalEventEmitter.h" -#if __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_8_0 - -#define UIUserNotificationTypeAlert UIRemoteNotificationTypeAlert -#define UIUserNotificationTypeBadge UIRemoteNotificationTypeBadge -#define UIUserNotificationTypeSound UIRemoteNotificationTypeSound -#define UIUserNotificationTypeNone UIRemoteNotificationTypeNone -#define UIUserNotificationType UIRemoteNotificationType - -#endif - @interface RCTOneSignal () @end From c8ac1c3110cd724e5f06e6f281358d500a4c2b97 Mon Sep 17 00:00:00 2001 From: Josh Kasten Date: Sat, 10 Apr 2021 01:09:33 -0700 Subject: [PATCH 2/4] rm handleRemoteNotificationOpened * This now setup in RCT_EXPORT_METHOD(setNotificationOpenedHandler) so this is dead code * rm supporting jsonObjectWithString method as this is now dead code * rm coldStartOSNotificationOpenedResult as it was never used --- ios/RCTOneSignal/RCTOneSignal.m | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/ios/RCTOneSignal/RCTOneSignal.m b/ios/RCTOneSignal/RCTOneSignal.m index 68020597..5787308e 100644 --- a/ios/RCTOneSignal/RCTOneSignal.m +++ b/ios/RCTOneSignal/RCTOneSignal.m @@ -20,8 +20,6 @@ @implementation RCTOneSignal { BOOL didInitialize; } -OSNotificationOpenedResult* coldStartOSNotificationOpenedResult; - + (RCTOneSignal *) sharedInstance { static dispatch_once_t token = 0; static id _sharedInstance = nil; @@ -40,26 +38,6 @@ - (void)initOneSignal:(NSDictionary *)launchOptions { didInitialize = true; } -- (void)handleRemoteNotificationOpened:(NSString *)result { - NSDictionary *json = [self jsonObjectWithString:result]; - - if (json) - [self sendEvent:OSEventString(NotificationOpened) withBody:json]; -} - -- (NSDictionary *)jsonObjectWithString:(NSString *)jsonString { - NSError *jsonError; - NSData *data = [jsonString dataUsingEncoding:NSUTF8StringEncoding]; - NSDictionary *json = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers error:&jsonError]; - - if (jsonError) { - [OneSignal onesignalLog:ONE_S_LL_ERROR message:[NSString stringWithFormat:@"Unable to serialize JSON string into an object: %@", jsonError]]; - return nil; - } - - return json; -} - - (void)sendEvent:(NSString *)eventName withBody:(NSDictionary *)body { [RCTOneSignalEventEmitter sendEventWithName:eventName withBody:body]; } From 1d41a99fbdefd79ddee1aff0a1c7d0458d9002eb Mon Sep 17 00:00:00 2001 From: Josh Kasten Date: Sat, 10 Apr 2021 01:11:54 -0700 Subject: [PATCH 3/4] rm didStartObserving from RCTOneSignal.h * This is used anywhere. * Not related to RCTOneSignalEventEmitter's _didStartObserving --- ios/RCTOneSignal/RCTOneSignal.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/ios/RCTOneSignal/RCTOneSignal.h b/ios/RCTOneSignal/RCTOneSignal.h index 9cee757c..483c6309 100644 --- a/ios/RCTOneSignal/RCTOneSignal.h +++ b/ios/RCTOneSignal/RCTOneSignal.h @@ -11,8 +11,6 @@ + (RCTOneSignal *) sharedInstance; -@property (nonatomic) BOOL didStartObserving; - - (void)initOneSignal:(NSDictionary *)launchOptions; @end From 41a6193800fb71f938865f19de1e8f1763b9dabe Mon Sep 17 00:00:00 2001 From: Josh Kasten Date: Sat, 10 Apr 2021 01:15:43 -0700 Subject: [PATCH 4/4] rm NSNotificationCenter removeObserver * RCTOneSignal never uses NSNotificationCenter, removeObserver is dead code --- ios/RCTOneSignal/RCTOneSignal.m | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ios/RCTOneSignal/RCTOneSignal.m b/ios/RCTOneSignal/RCTOneSignal.m index 5787308e..1dd05c45 100644 --- a/ios/RCTOneSignal/RCTOneSignal.m +++ b/ios/RCTOneSignal/RCTOneSignal.m @@ -54,8 +54,4 @@ - (void)onOSPermissionChanged:(OSPermissionStateChanges *)stateChanges { [self sendEvent:OSEventString(PermissionChanged) withBody:stateChanges.toDictionary]; } -- (void)dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - @end