Fixing OSObservable init with change selector being optional

emawby · emawby · commit 96083d4e094e · 2022-12-16T12:12:21.000-08:00
diff --git a/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OSObservable.h b/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OSObservable.h
@@ -34,7 +34,7 @@
 @end
 
 @interface OSObservable<__covariant ObserverType, __covariant ObjectType> : NSObject
-- (instancetype)initWithChangeSelector:(SEL)selector;
+- (instancetype _Nonnull)initWithChangeSelector:(SEL)selector;
 - (void)addObserver:(ObserverType)observer;
 - (void)removeObserver:(ObserverType)observer;
 - (BOOL)notifyChange:(ObjectType)state;
diff --git a/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OSObservable.m b/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OSObservable.m
@@ -34,7 +34,7 @@ @implementation OSObservable {
 SEL changeSelector;
 }
 
-- (instancetype)initWithChangeSelector:(SEL)selector {
+- (instancetype _Nonnull)initWithChangeSelector:(SEL)selector {
     if (self = [super init]) {
         observers = [NSHashTable weakObjectsHashTable];
         changeSelector = selector;
diff --git a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OneSignalUserManagerImpl.swift b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OneSignalUserManagerImpl.swift
@@ -138,8 +138,7 @@ public class OneSignalUserManagerImpl: NSObject, OneSignalUserManager {
         let pushSubscriptionStateChangesObserver = OSObservable<OSPushSubscriptionObserver, OSPushSubscriptionStateChanges>(change: #selector(OSPushSubscriptionObserver.onOSPushSubscriptionChanged(stateChanges:)))
         _pushSubscriptionStateChangesObserver = pushSubscriptionStateChangesObserver
 
-        // TODO: What's going on, fix this.
-        return pushSubscriptionStateChangesObserver ?? OSObservable<OSPushSubscriptionObserver, OSPushSubscriptionStateChanges>(change: #selector(OSPushSubscriptionObserver.onOSPushSubscriptionChanged(stateChanges:)))
+        return pushSubscriptionStateChangesObserver
     }
 
     // has Identity, Properties, and Subscription Model Stores

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ @implementation OSObservable {`
`34`	`34`	`SEL changeSelector;`
`35`	`35`	`}`
`36`	`36`
`37`		`-- (instancetype)initWithChangeSelector:(SEL)selector {`
	`37`	`+- (instancetype _Nonnull)initWithChangeSelector:(SEL)selector {`
`38`	`38`	`if (self = [super init]) {`
`39`	`39`	`observers = [NSHashTable weakObjectsHashTable];`
`40`	`40`	`changeSelector = selector;`
Original file line number	Diff line number	Diff line change
`@@ -138,8 +138,7 @@ public class OneSignalUserManagerImpl: NSObject, OneSignalUserManager {`
`138`	`138`	`let pushSubscriptionStateChangesObserver = OSObservable<OSPushSubscriptionObserver, OSPushSubscriptionStateChanges>(change: #selector(OSPushSubscriptionObserver.onOSPushSubscriptionChanged(stateChanges:)))`
`139`	`139`	`_pushSubscriptionStateChangesObserver = pushSubscriptionStateChangesObserver`
`140`	`140`
`141`		`- // TODO: What's going on, fix this.`
`142`		`- return pushSubscriptionStateChangesObserver ?? OSObservable<OSPushSubscriptionObserver, OSPushSubscriptionStateChanges>(change: #selector(OSPushSubscriptionObserver.onOSPushSubscriptionChanged(stateChanges:)))`
	`141`	`+ return pushSubscriptionStateChangesObserver`
`143`	`142`	`}`
`144`	`143`
`145`	`144`	`// has Identity, Properties, and Subscription Model Stores`