From 63869446b1397496f40e120f97c6a0e0c061557f Mon Sep 17 00:00:00 2001 From: Erisu Date: Wed, 18 Sep 2024 19:32:34 +0900 Subject: [PATCH] feat(ios)!: move last bit of firebase & imports to PushPluginFCM --- src/ios/PushPlugin.m | 9 ++++----- src/ios/PushPluginFCM.h | 6 ++++++ src/ios/PushPluginFCM.m | 4 ++++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/ios/PushPlugin.m b/src/ios/PushPlugin.m index 3edca8b3d..ced1bac19 100644 --- a/src/ios/PushPlugin.m +++ b/src/ios/PushPlugin.m @@ -28,10 +28,6 @@ #import "PushPluginSettings.h" #import "AppDelegate+notification.h" -@import Firebase; -@import FirebaseCore; -@import FirebaseMessaging; - @interface PushPlugin () @property (nonatomic, strong) PushPluginFCM *pushPluginFCM; @@ -128,7 +124,10 @@ - (void)init:(CDVInvokedUrlCommand *)command { } else { NSLog(@"[PushPlugin] VoIP missing or false"); if ([self.pushPluginFCM isFCMEnabled]) { - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(setFCMTokenWithCompletion) name:FIRMessagingRegistrationTokenRefreshedNotification object:nil]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(setFCMTokenWithCompletion) + name:[PushPluginFCM pushPluginFCMMessagingRegistrationTokenRefreshedNotification] + object:nil]; } [self.commandDelegate runInBackground:^ { diff --git a/src/ios/PushPluginFCM.h b/src/ios/PushPluginFCM.h index a389ac2e7..7fc7695e8 100644 --- a/src/ios/PushPluginFCM.h +++ b/src/ios/PushPluginFCM.h @@ -1,6 +1,8 @@ #import @import Firebase; +NS_ASSUME_NONNULL_BEGIN + @interface PushPluginFCM : NSObject @property (nonatomic, assign) BOOL isFCMEnabled; @@ -17,4 +19,8 @@ - (void)unsubscribeFromTopic:(NSString *)topic; - (void)unsubscribeFromTopics:(NSArray *)topics; ++ (NSNotificationName)pushPluginFCMMessagingRegistrationTokenRefreshedNotification; + @end + +NS_ASSUME_NONNULL_END diff --git a/src/ios/PushPluginFCM.m b/src/ios/PushPluginFCM.m index 01f2314d3..779ab2c65 100644 --- a/src/ios/PushPluginFCM.m +++ b/src/ios/PushPluginFCM.m @@ -100,4 +100,8 @@ - (void)unsubscribeFromTopic:(NSString *)topic { NSLog(@"[PushPlugin] Successfully unsubscribed from topic %@", topic); } ++ (NSNotificationName)pushPluginFCMMessagingRegistrationTokenRefreshedNotification { + return FIRMessagingRegistrationTokenRefreshedNotification; +} + @end