Skip to content

Commit deb6137

Browse files
committed
re-arrange User Manager startup code order
* User executor should run earlier
1 parent 2e4447a commit deb6137

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OneSignalUserManagerImpl.swift

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public class OneSignalUserManagerImpl: NSObject, OneSignalUserManager {
9797
@objc public var pushSubscriptionId: String? {
9898
return _user?.pushSubscriptionModel.subscriptionId
9999
}
100-
100+
101101
@objc public var language: String? {
102102
return _user?.propertiesModel.language
103103
}
@@ -194,14 +194,7 @@ public class OneSignalUserManagerImpl: NSObject, OneSignalUserManager {
194194
OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OneSignalUserManager.start called, loaded the user from cache.")
195195
}
196196

197-
// Creates an anonymous user if there isn't one in the cache
198-
createUserIfNil()
199-
200-
// Model store listeners subscribe to their models
201-
identityModelStoreListener.start()
202-
propertiesModelStoreListener.start()
203-
subscriptionModelStoreListener.start()
204-
pushSubscriptionModelStoreListener.start()
197+
// TODO: Update the push sub model with any new state from NotificationsManager
205198

206199
// Setup the executors
207200
OSUserExecutor.start()
@@ -217,6 +210,15 @@ public class OneSignalUserManagerImpl: NSObject, OneSignalUserManager {
217210
OSOperationRepo.sharedInstance.addExecutor(identityExecutor)
218211
OSOperationRepo.sharedInstance.addExecutor(propertyExecutor)
219212
OSOperationRepo.sharedInstance.addExecutor(subscriptionExecutor)
213+
214+
// Creates an anonymous user if there isn't one in the cache
215+
createUserIfNil()
216+
217+
// Model store listeners subscribe to their models
218+
identityModelStoreListener.start()
219+
propertiesModelStoreListener.start()
220+
subscriptionModelStoreListener.start()
221+
pushSubscriptionModelStoreListener.start()
220222
}
221223

222224
@objc

0 commit comments

Comments
 (0)