Skip to content

Commit 2180aa4

Browse files
committed
add push subscription observer returns void
* Don't return the current state when the observer is added, return void
1 parent 1171f7f commit 2180aa4

File tree

4 files changed

+7
-14
lines changed

4 files changed

+7
-14
lines changed

iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
9090
[OneSignal.Notifications setNotificationWillShowInForegroundHandler:notificationReceiverBlock];
9191
[OneSignal.Notifications setNotificationOpenedHandler:openNotificationHandler];
9292

93-
OSPushSubscriptionState* state = [OneSignal.User.pushSubscription addObserver:self];
94-
NSLog(@"OneSignal Demo App push subscription observer added, current state: %@", state);
93+
[OneSignal.User.pushSubscription addObserver:self];
94+
NSLog(@"OneSignal Demo App push subscription observer added");
9595

9696
[OneSignal.Notifications addPermissionObserver:self];
9797

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OneSignalUserManagerImpl.swift

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ import OneSignalNotifications
8282

8383
func optIn()
8484
func optOut()
85-
func addObserver(_ observer: OSPushSubscriptionObserver) -> OSPushSubscriptionState?
85+
func addObserver(_ observer: OSPushSubscriptionObserver)
8686
func removeObserver(_ observer: OSPushSubscriptionObserver)
8787
}
8888

@@ -669,12 +669,11 @@ extension OneSignalUserManagerImpl: OSUser {
669669

670670
extension OneSignalUserManagerImpl: OSPushSubscription {
671671

672-
public func addObserver(_ observer: OSPushSubscriptionObserver) -> OSPushSubscriptionState? {
672+
public func addObserver(_ observer: OSPushSubscriptionObserver) {
673673
guard !OneSignalConfigManager.shouldAwaitAppIdAndLogMissingPrivacyConsent(forMethod: "pushSubscription.addObserver") else {
674-
return nil
674+
return
675675
}
676676
self.pushSubscriptionStateChangesObserver.addObserver(observer)
677-
return user.pushSubscriptionModel.currentPushSubscriptionState
678677
}
679678

680679
public func removeObserver(_ observer: OSPushSubscriptionObserver) {

iOS_SDK/OneSignalSDK/Source/OSMessagingController.m

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,7 @@ + (void)removeInstance {
111111

112112
+ (void)start {
113113
OSMessagingController *shared = OSMessagingController.sharedInstance;
114-
#pragma clang diagnostic push
115-
#pragma clang diagnostic ignored "-Wunused-variable"
116-
OSPushSubscriptionState *_ = [OneSignalUserManagerImpl.sharedInstance addObserver:shared];
117-
#pragma clang diagnostic pop
114+
[OneSignalUserManagerImpl.sharedInstance addObserver:shared];
118115
}
119116

120117
static BOOL _isInAppMessagingPaused = false;

iOS_SDK/OneSignalSDK/Source/OneSignalLiveActivityController.m

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,7 @@ + (OneSignalLiveActivityController *)sharedInstance {
7979
+ (void)initialize {
8080
subscriptionId = OneSignalUserManagerImpl.sharedInstance.pushSubscriptionId;
8181
OneSignalLiveActivityController *shared = OneSignalLiveActivityController.sharedInstance;
82-
#pragma clang diagnostic push
83-
#pragma clang diagnostic ignored "-Wunused-variable"
84-
OSPushSubscriptionState *_ = [OneSignalUserManagerImpl.sharedInstance addObserver:shared];
85-
#pragma clang diagnostic pop
82+
[OneSignalUserManagerImpl.sharedInstance addObserver:shared];
8683
}
8784

8885
- (void)onOSPushSubscriptionChangedWithStateChanges:(OSPushSubscriptionStateChanges * _Nonnull)stateChanges {

0 commit comments

Comments
 (0)