Skip to content

Commit

Permalink
feat(ios)!: extract FCM related logic to PushPluginFCM (#293)
Browse files Browse the repository at this point in the history
* feat(ios)!: PushPluginFCM - extract isFCMEnabled logic & set in pluginInitialize
* feat(ios)!: PushPluginFCM - extract FCM configure logic & call in pluginInitialize
* feat(ios)!: PushPluginFCM - extract FCM topic subscribe & unsubscribe logic
* feat(ios)!: re-ordered the calling of FCM tokenWithCompletion after setting APNS token
* feat(ios)!: PushPluginFCM - move tokenWithCompletion logic
* feat(ios)!: cleaup registerWithToken
* feat(ios)!: subscribe & unsubscribe apis only run when FCM is enabled
* feat(ios)!: cleanup didRegisterForRemoteNotificationsWithDeviceToken
* feat(ios): PushPluginFCM - rename configureFirebase to configure
* feat(ios): PushPluginFCM - move setAPNSToken
* feat(ios)!: move last bit of firebase & imports to PushPluginFCM
* feat(ios): cleanup & trigger registerWithToken once each launch
* feat(ios)!: PushPluginFCM - move more FCM logic over
* feat(ios)!: PushPluginFCM - cleanup
  • Loading branch information
erisu authored Oct 16, 2024
1 parent 260bfd9 commit 1323ec8
Show file tree
Hide file tree
Showing 7 changed files with 250 additions and 146 deletions.
3 changes: 3 additions & 0 deletions plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
<config-file target="config.xml" parent="/*">
<feature name="PushNotification">
<param name="ios-package" value="PushPlugin"/>
<param name="onload" value="true"/>
</feature>
</config-file>

Expand All @@ -117,10 +118,12 @@

<source-file src="src/ios/AppDelegate+notification.m"/>
<source-file src="src/ios/PushPlugin.m"/>
<source-file src="src/ios/PushPluginFCM.m"/>
<source-file src="src/ios/PushPluginSettings.m"/>

<header-file src="src/ios/AppDelegate+notification.h"/>
<header-file src="src/ios/PushPlugin.h"/>
<header-file src="src/ios/PushPluginFCM.h"/>
<header-file src="src/ios/PushPluginSettings.h"/>

<framework src="PushKit.framework"/>
Expand Down
2 changes: 0 additions & 2 deletions src/ios/AppDelegate+notification.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
#import "AppDelegate.h"
@import UserNotifications;

extern NSString *const pushPluginApplicationDidBecomeActiveNotification;

@interface AppDelegate (notification) <UNUserNotificationCenterDelegate>
- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken;
- (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error;
Expand Down
4 changes: 0 additions & 4 deletions src/ios/AppDelegate+notification.m
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@

static char launchNotificationKey;
static char coldstartKey;
NSString *const pushPluginApplicationDidBecomeActiveNotification = @"pushPluginApplicationDidBecomeActiveNotification";


@implementation AppDelegate (notification)

Expand Down Expand Up @@ -180,8 +178,6 @@ - (void)pushPluginOnApplicationDidBecomeActive:(NSNotification *)notification {
self.coldstart = [NSNumber numberWithBool:NO];
[pushHandler performSelectorOnMainThread:@selector(notificationReceived) withObject:pushHandler waitUntilDone:NO];
}

[[NSNotificationCenter defaultCenter] postNotificationName:pushPluginApplicationDidBecomeActiveNotification object:nil];
}

- (void)userNotificationCenter:(UNUserNotificationCenter *)center
Expand Down
5 changes: 0 additions & 5 deletions src/ios/PushPlugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,4 @@
- (void)pushRegistry:(PKPushRegistry *)registry didUpdatePushCredentials:(PKPushCredentials *)credentials forType:(NSString *)type;
- (void)pushRegistry:(PKPushRegistry *)registry didReceiveIncomingPushWithPayload:(PKPushPayload *)payload forType:(NSString *)type;

// FCM Features
@property(nonatomic, assign) BOOL usesFCM;
@property(nonatomic, strong) NSString *fcmSenderId;
@property(nonatomic, strong) NSArray *fcmTopics;

@end
Loading

0 comments on commit 1323ec8

Please sign in to comment.