refactor(ios): remove legacy Xcode project and update imports

Author: fadi-george

examples/demo/bun.lock

@@ -1,37 +1,13 @@
-#if __has_include(<React/RCTConvert.h>)
-#import <React/RCTBridge.h>
-#import <React/RCTConvert.h>
-#import <React/RCTEventDispatcher.h>
-#import <React/RCTUtils.h>
-#else
-#import "RCTBridge.h"
-#import "RCTConvert.h"
-#import "RCTEventDispatcher.h"
-#import "RCTUtils.h"
-#endif
-
 #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
 
 @implementation RCTOneSignal {
   BOOL didInitialize;
 }
 
-OSNotificationClickResult *coldStartOSNotificationClickResult;
-
 + (RCTOneSignal *)sharedInstance {
   static dispatch_once_t token = 0;
   static id _sharedInstance = nil;
@@ -54,29 +30,6 @@ - (void)initOneSignal:(NSDictionary *)launchOptions {
   didInitialize = true;
 }
 
-- (void)handleRemoteNotificationOpened:(NSString *)result {
-  NSDictionary *json = [self jsonObjectWithString:result];
-
-  if (json) {
-    [self sendEvent:OSEventString(NotificationClicked) withBody:json];
-  }
-}
-
-- (NSDictionary *)jsonObjectWithString:(NSString *)jsonString {
-  NSError *jsonError;
-  NSData *data = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
-  NSDictionary *json =
-      [NSJSONSerialization JSONObjectWithData:data
-                                      options:NSJSONReadingMutableContainers
-                                        error:&jsonError];
-
-  if (jsonError) {
-    return nil;
-  }
-
-  return json;
-}
-
 - (void)sendEvent:(NSString *)eventName withBody:(NSDictionary *)body {
   [RCTOneSignalEventEmitter sendEventWithName:eventName withBody:body];
 }
@@ -176,8 +129,4 @@ - (void)onDidDismissInAppMessage:
          withBody:[event jsonRepresentation]];
 }
 
-- (void)dealloc {
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
-}
-
 @end

ios/RCTOneSignal/RCTOneSignal.mm

@@ -6,6 +6,10 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 
+@interface RCTOneSignalEventEmitter ()
+- (void)emitEventWithName:(NSString *)name body:(NSDictionary *)body;
+@end
+
 @implementation RCTOneSignalEventEmitter {
   BOOL _hasSetSubscriptionObserver;
   BOOL _hasSetPermissionObserver;
@@ -31,12 +35,6 @@ - (instancetype)init {
     _preventDefaultCache = [NSMutableDictionary new];
     _notificationWillDisplayCache = [NSMutableDictionary new];
 
-    for (NSString *eventName in OSNotificationEventTypesArray)
-      [[NSNotificationCenter defaultCenter] addObserver:self
-                                               selector:@selector(emitEvent:)
-                                                   name:eventName
-                                                 object:nil];
-
     // Clean up previous instance if it exists (handles reload scenario)
     if (_currentInstance != nil && _currentInstance != self) {
       [_currentInstance removeHandlers];
@@ -51,7 +49,11 @@ - (instancetype)init {
 - (void)invalidate {
   [self removeHandlers];
   [self removeObservers];
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
+  [_preventDefaultCache removeAllObjects];
+  [_notificationWillDisplayCache removeAllObjects];
+  if (_currentInstance == self) {
+    _currentInstance = nil;
+  }
 }
 
 - (NSArray<NSString *> *)processNSError:(NSError *)error {
@@ -66,14 +68,11 @@ - (void)invalidate {
 
 #pragma mark Send Event Methods
 
-- (void)emitEvent:(NSNotification *)notification {
+- (void)emitEventWithName:(NSString *)name body:(NSDictionary *)body {
   if (!_eventEmitterCallback) {
     return;
   }
 
-  NSString *name = notification.name;
-  NSDictionary *body = notification.userInfo;
-
   if ([name isEqualToString:OSEventString(PermissionChanged)]) {
     [self emitOnPermissionChanged:body];
   } else if ([name isEqualToString:OSEventString(SubscriptionChanged)]) {
@@ -99,9 +98,7 @@ - (void)emitEvent:(NSNotification *)notification {
 }
 
 + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
-  [[NSNotificationCenter defaultCenter] postNotificationName:name
-                                                      object:nil
-                                                    userInfo:body];
+  [_currentInstance emitEventWithName:name body:body];
 }
 
 #pragma mark Exported Methods
@@ -341,7 +338,7 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
   }
 }
 
-RCT_EXPORT_METHOD(removePermissionObserver) {
+- (void)removePermissionObserver {
   if (_hasSetPermissionObserver) {
     [OneSignal.Notifications
         removePermissionObserver:[RCTOneSignal sharedInstance]];
@@ -370,22 +367,14 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
 
 RCT_EXPORT_METHOD(onWillDisplayNotification : (OSNotificationWillDisplayEvent *)
                       event) {
-  __weak RCTOneSignalEventEmitter *weakSelf = self;
-  RCTOneSignalEventEmitter *strongSelf = weakSelf;
-  if (!strongSelf)
-    return;
-
-  strongSelf->_notificationWillDisplayCache[event.notification.notificationId] =
-      event;
+  _notificationWillDisplayCache[event.notification.notificationId] = event;
   [event preventDefault];
   [RCTOneSignalEventEmitter
       sendEventWithName:@"OneSignal-notificationWillDisplayInForeground"
                withBody:[event.notification jsonRepresentation]];
 }
 
 RCT_EXPORT_METHOD(preventDefault : (NSString *)notificationId) {
-  __weak RCTOneSignalEventEmitter *weakSelf = self;
-  RCTOneSignalEventEmitter *strongSelf = weakSelf;
   OSNotificationWillDisplayEvent *event =
       _notificationWillDisplayCache[notificationId];
   if (!event) {
@@ -398,7 +387,7 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
                              notificationId]];
     return;
   }
-  strongSelf->_preventDefaultCache[event.notification.notificationId] = event;
+  _preventDefaultCache[event.notification.notificationId] = event;
   [event preventDefault];
 }
 
@@ -442,7 +431,7 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
   }
 }
 
-RCT_EXPORT_METHOD(removePushSubscriptionObserver) {
+- (void)removePushSubscriptionObserver {
   if (_hasSetSubscriptionObserver) {
     [OneSignal.User.pushSubscription
         removeObserver:[RCTOneSignal sharedInstance]];
@@ -625,3 +614,5 @@ - (void)removeUserStateObserver {
 }
 
 @end
+
+#pragma GCC diagnostic pop

ios/RCTOneSignal/RCTOneSignalEventEmitter.mm

@@ -3,8 +3,6 @@
 
 @interface RCTOneSignal
 + (RCTOneSignal *)sharedInstance;
-- (void)initialize:(nonnull NSString *)newAppId
-    withLaunchOptions:(nullable NSDictionary *)launchOptions;
 - (void)initOneSignal:(NSDictionary *)launchOptions;
 @end