Skip to content

Commit d4816ab

Browse files
nan-linan-li
committed
[nits] Logs, TODOs, swiftlint
* Comments, TODOs, and swiftlint * Remove too extraneous logging * add informational logging
1 parent e0f80e9 commit d4816ab

17 files changed

+115
-111
lines changed

‎iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
5858
_notificationDelegate = [OneSignalNotificationCenterDelegate new];
5959

6060
id openNotificationHandler = ^(OSNotificationOpenedResult *result) {
61+
// TODO: opened handler Not triggered
6162
NSLog(@"OSNotificationOpenedResult: %@", result.action);
6263
#pragma clang diagnostic push
6364
#pragma clang diagnostic ignored "-Wdeprecated"

‎iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalUserDefaults.m‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,14 @@
3131

3232
@implementation OneSignalUserDefaults : NSObject
3333

34+
// TODO: Revisit if we should use a singletone, not init so much
3435
+ (OneSignalUserDefaults * _Nonnull)initStandard {
3536
OneSignalUserDefaults *instance = [OneSignalUserDefaults new];
3637
instance.userDefaults = [instance getStandardUserDefault];
3738
return instance;
3839
}
3940

41+
// TODO: Revisit if we should use a singletone, not init so much
4042
+ (OneSignalUserDefaults * _Nonnull)initShared {
4143
OneSignalUserDefaults *instance = [OneSignalUserDefaults new];
4244
instance.userDefaults = [instance getSharedUserDefault];

‎iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSEventProducer.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public class OSEventProducer<THandler>: NSObject {
4747
public func fire(callback: (THandler) -> Void) {
4848
// dump(subscribers) -> uncomment for more verbose log during testing
4949
if let subscriber = subscriber {
50-
OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSEventProducer.fire() called with subscriber")
5150
callback(subscriber)
5251
}
5352
}

‎iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSModelChangedHandler.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class OSModelChangedArgs: NSObject {
4646
override public var description: String {
4747
return "OSModelChangedArgs for model: \(model) with property: \(property) value: \(newValue)"
4848
}
49-
49+
5050
init(model: OSModel, property: String, newValue: Any) {
5151
self.model = model
5252
self.property = property

‎iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSModelStore.swift‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ open class OSModelStore<TModel: OSModel>: NSObject {
6666
public func getModel(key: String) -> TModel? {
6767
return self.models[key]
6868
}
69-
69+
7070
/**
7171
Uses the `modelId` to get the corresponding model in the store's models dictionary.
7272
*/
@@ -87,18 +87,19 @@ open class OSModelStore<TModel: OSModel>: NSObject {
8787
OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSModelStore add() called with model \(model)")
8888
// TODO: Check if we are adding the same model? Do we replace?
8989
// For example, calling addEmail multiple times with the same email
90+
// Check API endpoint for behavior
9091
models[id] = model
9192

9293
// persist the models (including new model) to storage
9394
OneSignalUserDefaults.initShared().saveCodeableData(forKey: self.storeKey, withValue: self.models)
9495

9596
// listen for changes to this model
9697
model.changeNotifier.subscribe(self)
97-
98+
9899
guard !hydrating else {
99100
return
100101
}
101-
102+
102103
self.changeSubscription.fire { modelStoreListener in
103104
modelStoreListener.onAdded(model)
104105
}

‎iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSOperationRepo.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@ public class OSOperationRepo: NSObject {
112112
return
113113
}
114114
start()
115-
if (!deltaQueue.isEmpty) {
116-
115+
if !deltaQueue.isEmpty {
117116
OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSOperationRepo flushDeltaQueue with queue: \(deltaQueue)")
118117
}
119118

‎iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSIdentityModel.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class OSIdentityModel: OSModel {
3939
}
4040

4141
var aliases: [String: String] = [:]
42-
42+
4343
// TODO: We need to make this token secure
4444
public var jwtBearerToken: String?
4545

‎iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSIdentityOperationExecutor.swift‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
5252
} else {
5353
OneSignalLog.onesignalLog(.LL_ERROR, message: "OSIdentityOperationExecutor error encountered reading from cache for \(OS_IDENTITY_EXECUTOR_DELTA_QUEUE_KEY)")
5454
}
55-
55+
5656
// Read unfinished requests from cache, if any...
57-
57+
5858
if var addRequestQueue = OneSignalUserDefaults.initShared().getSavedCodeableData(forKey: OS_IDENTITY_EXECUTOR_ADD_REQUEST_QUEUE_KEY, defaultValue: []) as? [OSRequestAddAliases] {
5959
// Hook each uncached Request to the model in the store
6060
for (index, request) in addRequestQueue.enumerated().reversed() {
@@ -70,7 +70,7 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
7070
} else {
7171
OneSignalLog.onesignalLog(.LL_ERROR, message: "OSIdentityOperationExecutor error encountered reading from cache for \(OS_IDENTITY_EXECUTOR_ADD_REQUEST_QUEUE_KEY)")
7272
}
73-
73+
7474
if var removeRequestQueue = OneSignalUserDefaults.initShared().getSavedCodeableData(forKey: OS_IDENTITY_EXECUTOR_REMOVE_REQUEST_QUEUE_KEY, defaultValue: []) as? [OSRequestRemoveAlias] {
7575
// Hook each uncached Request to the model in the store
7676
for (index, request) in removeRequestQueue.enumerated().reversed() {
@@ -98,7 +98,7 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
9898
}
9999

100100
func processDeltaQueue() {
101-
if (!deltaQueue.isEmpty) {
101+
if !deltaQueue.isEmpty {
102102
OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSIdentityOperationExecutor processDeltaQueue with queue: \(deltaQueue)")
103103
}
104104
for delta in deltaQueue {
@@ -138,7 +138,7 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
138138

139139
func processRequestQueue() {
140140
let requestQueue: [OneSignalRequest] = addRequestQueue + removeRequestQueue
141-
141+
142142
if requestQueue.isEmpty {
143143
return
144144
}
@@ -160,8 +160,9 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
160160
func executeAddAliasesRequest(_ request: OSRequestAddAliases) {
161161
OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSIdentityOperationExecutor: executeAddAliasesRequest making request: \(request)")
162162

163-
OneSignalClient.shared().execute(request) { result in
163+
OneSignalClient.shared().execute(request) { _ in
164164
// Mock a response
165+
// TODO: Is there even a response to hydrate?
165166
let response = ["onesignalId": UUID().uuidString, "label01": "id01"]
166167

167168
// On success, remove request from cache, and hydrate model
@@ -182,9 +183,10 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
182183
func executeRemoveAliasRequest(_ request: OSRequestRemoveAlias) {
183184
OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSIdentityOperationExecutor: executeRemoveAliasRequest making request: \(request)")
184185

185-
OneSignalClient.shared().execute(request) { result in
186+
OneSignalClient.shared().execute(request) { _ in
186187

187188
// Mock a response
189+
// TODO: Is there even a response to hydrate?
188190
let response = ["onesignalId": UUID().uuidString, "label01": "id01"]
189191

190192
// On success, remove request from cache, and hydrate model

‎iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSPropertiesModel.swift‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ struct OSPropertiesDeltas {
3333
let sessionTime: NSNumber?
3434
let sessionCount: NSNumber?
3535
let amountSpent: NSNumber?
36-
let purchases: [[String:AnyObject]]?
37-
38-
func toDictionary() -> [String:Any] {
39-
var deltas = [String:Any]()
36+
let purchases: [[String: AnyObject]]?
37+
38+
func toDictionary() -> [String: Any] {
39+
var deltas = [String: Any]()
4040
deltas["session_count"] = sessionCount
4141
deltas["session_time"] = sessionTime?.intValue // server expects an int
4242
deltas["amountSpent"] = amountSpent
@@ -51,13 +51,13 @@ class OSPropertiesModel: OSModel {
5151
self.set(property: "language", newValue: language)
5252
}
5353
}
54-
54+
5555
var lat: Float? {
5656
didSet {
5757
self.set(property: "lat", newValue: lat)
5858
}
5959
}
60-
60+
6161
var long: Float? {
6262
didSet {
6363
self.set(property: "long", newValue: long)
@@ -116,7 +116,7 @@ class OSPropertiesModel: OSModel {
116116
case "language":
117117
self.language = property.value as? String
118118
case "tags":
119-
self.tags = property.value as? [String : String] ?? [:]
119+
self.tags = property.value as? [String: String] ?? [:]
120120
default:
121121
OneSignalLog.onesignalLog(.LL_DEBUG, message: "Not hydrating properties model for property: \(property)")
122122
}

‎iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSPropertyOperationExecutor.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,13 @@ class OSPropertyOperationExecutor: OSOperationExecutor {
5050
} else {
5151
OneSignalLog.onesignalLog(.LL_ERROR, message: "OSPropertyOperationExecutor error encountered reading from cache for \(OS_PROPERTIES_EXECUTOR_DELTA_QUEUE_KEY)")
5252
}
53-
53+
5454
// Read unfinished requests from cache, if any...
5555
if var updateRequestQueue = OneSignalUserDefaults.initShared().getSavedCodeableData(forKey: OS_PROPERTIES_EXECUTOR_UPDATE_REQUEST_QUEUE_KEY, defaultValue: []) as? [OSRequestUpdateProperties] {
5656
// Hook each uncached Request to the model in the store
5757
for (index, request) in updateRequestQueue.enumerated().reversed() {
5858
if let propertiesModel = OneSignalUserManagerImpl.sharedInstance.propertiesModelStore.getModel(modelId: request.modelToUpdate.modelId),
59-
let identityModel = OneSignalUserManagerImpl.sharedInstance.identityModelStore.getModel(modelId: request.identityModel.modelId)
60-
{
59+
let identityModel = OneSignalUserManagerImpl.sharedInstance.identityModelStore.getModel(modelId: request.identityModel.modelId) {
6160
// The models exist in the stores, set it to be the Request's models
6261
request.modelToUpdate = propertiesModel
6362
request.identityModel = identityModel
@@ -82,7 +81,7 @@ class OSPropertyOperationExecutor: OSOperationExecutor {
8281
}
8382

8483
func processDeltaQueue() {
85-
if (!deltaQueue.isEmpty) {
84+
if !deltaQueue.isEmpty {
8685
OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSPropertyOperationExecutor processDeltaQueue with queue: \(deltaQueue)")
8786
}
8887
for delta in deltaQueue {
@@ -124,9 +123,10 @@ class OSPropertyOperationExecutor: OSOperationExecutor {
124123
return
125124
}
126125
OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSPropertyOperationExecutor: executeUpdatePropertiesRequest making request: \(request)")
127-
OneSignalClient.shared().execute(request) { result in
126+
OneSignalClient.shared().execute(request) { _ in
128127

129128
// On success, remove request from cache, and hydrate model
129+
// TODO: Do we actually hydrate model though?
130130
// For example, if app restarts and we read in operations between sending this off and getting the response
131131
self.updateRequestQueue.removeAll(where: { $0 == request})
132132
OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_PROPERTIES_EXECUTOR_UPDATE_REQUEST_QUEUE_KEY, withValue: self.updateRequestQueue)

0 commit comments

Comments
 (0)