remove print and NSLog from SDK, use onesignallog

* Replace all Swift `print()` calls with OneSignalLog.
* Replace a few NSLogs in the SDK with OneSignalLog as well.

Author: nan-li

iOS_SDK/OneSignalSDK/OneSignalCore/Source/API/OSRequests.m

@@ -302,7 +302,7 @@ + (instancetype)withUserId:(NSString *)userId
        externalIdAuthToken:(NSString *)externalIdAuthToken {
     let request = [OSRequestUpdateLanguage new];
 
-    NSLog(@"Attempting Update to Language");
+    [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:@"Attempting Update to Language"];
 
     let params = [NSMutableDictionary new];
     params[@"app_id"] = appId;

iOS_SDK/OneSignalSDK/OneSignalCore/Source/API/OneSignalClient.m

@@ -101,13 +101,14 @@ - (void)executeSimultaneousRequests:(NSDictionary<NSString *, OneSignalRequest *
                 results[identifier] = result;
                 // Add a success as 1 (success) to the response
                 response[identifier] = @{ @"success" : @(true) };
-                NSLog(@"Request %@ success result %@", request, result);
+                [OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"Request %@ success result %@", request, result]];
                 dispatch_group_leave(group);
             } onFailure:^(NSError *error) {
                 errors[identifier] = error;
                 // Add a success as 0 (failed) to the response
                 response[identifier] = @{ @"success" : @(false) };
-                NSLog(@"Request %@ fail result error %@", request, error);
+                [OneSignalLog onesignalLog:ONE_S_LL_ERROR message:[NSString stringWithFormat:@"Request %@ fail result error %@", request, error]];
+
                 dispatch_group_leave(group);
             }];
         }
@@ -153,11 +154,11 @@ - (void)executeSimultaneousRequests:(NSDictionary<NSString *, OneSignalRequest *
             dispatch_group_enter(group);
             [self executeRequest:request onSuccess:^(NSDictionary *result) {
                 results[identifier] = result;
-                NSLog(@"Request %@ success result %@", request, result);
+                [OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"Request %@ success result %@", request, result]];
                 dispatch_group_leave(group);
             } onFailure:^(NSError *error) {
                 errors[identifier] = error;
-                NSLog(@"Request %@ fail result error %@", request, error);
+                [OneSignalLog onesignalLog:ONE_S_LL_ERROR message:[NSString stringWithFormat:@"Request %@ fail result error %@", request, error]];
                 dispatch_group_leave(group);
             }];
         }

iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSEventProducer.swift

@@ -26,27 +26,28 @@
  */
 
 import Foundation
+import OneSignalCore
 
 public class OSEventProducer<THandler>: NSObject {
     // Not an array as there is at most 1 subsriber per OSEventProducer anyway
     var subscriber: THandler?
 
     public func subscribe(_ handler: THandler) {
-        print("🔥 OSEventProducer.subscribe() called with handler: \(handler)")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSEventProducer.subscribe() called with handler: \(handler)")
         // TODO: UM do we want to synchronize on subscribers
         subscriber = handler // TODO: UM style, implicit or explicit self?
     }
 
     public func unsubscribe(_ handler: THandler) {
-        print("🔥 OSEventProducer.unsubscribe() called with handler: \(handler)")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSEventProducer.unsubscribe() called with handler: \(handler)")
         // TODO: UM do we want to synchronize on subscribers
         subscriber = nil
     }
 
     public func fire(callback: (THandler) -> Void) {
-        print("🔥 OSEventProducer.fire() called with the following subscribers:")
         // dump(subscribers) -> uncomment for more verbose log during testing
         if let subscriber = subscriber {
+            OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSEventProducer.fire() called with subscriber")
             callback(subscriber)
         }
     }

iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSModel.swift

@@ -71,8 +71,6 @@ open class OSModel: NSObject, NSCoding {
     }
 
     open func hydrateModel(_ response: [String: Any]) {
-        // Log as an error.
-        print("Error: Function must be overridden.")
         fatalError("hydrateModel(response:) has not been implemented")
     }
 }

iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSModelStore.swift

@@ -72,7 +72,7 @@ open class OSModelStore<TModel: OSModel>: NSObject {
     }
 
     public func add(id: String, model: TModel) {
-        print("🔥 OSModelStore add with model \(model)")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSModelStore add() called with model \(model)")
         // TODO: Check if we are adding the same model? Do we replace?
             // For example, calling addEmail multiple times with the same email
         models[id] = model
@@ -93,7 +93,7 @@ open class OSModelStore<TModel: OSModel>: NSObject {
      This can happen if remove email or SMS is called and it doesn't exist in the store.
      */
     public func remove(_ id: String) -> Bool {
-        print("🔥 OSModelStore remove with model \(id)")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSModelStore remove() called with model \(id)")
         // TODO: Nothing will happen if model doesn't exist in the store
         if let model = models[id] {
             models.removeValue(forKey: id)
@@ -143,7 +143,7 @@ open class OSModelStore<TModel: OSModel>: NSObject {
 
 extension OSModelStore: OSModelChangedHandler {
     public func onModelUpdated(args: OSModelChangedArgs, hydrating: Bool) {
-        print("🔥 OSModelStore.onChanged() with args \(args)")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSModelStore.onChanged() called with OSModelChangedArgs: \(args)")
 
         // persist the changed models to storage
         OneSignalUserDefaults.initShared().saveCodeableData(forKey: self.storeKey, withValue: self.models)

iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSModelStoreListener.swift

@@ -26,6 +26,7 @@
  */
 
 import Foundation
+import OneSignalCore
 
 public protocol OSModelStoreListener: OSModelStoreChangedHandler {
     associatedtype TModel: OSModel
@@ -51,7 +52,7 @@ extension OSModelStoreListener {
     }
 
     public func onAdded(_ model: OSModel) {
-        print("🔥 OSModelStoreListener.onAdded() with model \(model)")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSModelStoreListener.onAdded() with model \(model)")
         guard let addedModel = model as? Self.TModel else {
             // log error
             return
@@ -62,14 +63,14 @@ extension OSModelStoreListener {
     }
 
     public func onUpdated(_ args: OSModelChangedArgs) {
-        print("🔥 OSModelStoreListener.onUpdated() with args \(args)")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSModelStoreListener.onUpdated() with args \(args)")
         if let delta = getUpdateModelDelta(args) {
             OSOperationRepo.sharedInstance.enqueueDelta(delta)
         }
     }
 
     public func onRemoved(_ model: OSModel) {
-        print("🔥 OSModelStoreListener.onRemoved() with model \(model)")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSModelStoreListener.onRemoved() called with model \(model)")
         guard let removedModel = model as? Self.TModel else {
             // log error
             return

iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSOperationRepo.swift

@@ -58,7 +58,7 @@ public class OSOperationRepo: NSObject {
         }
         hasCalledStart = true
 
-        print("🔥 OSOperationRepo start()")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSOperationRepo calling start()")
         // register as user observer
         NotificationCenter.default.addObserver(self,
                                                selector: #selector(self.flushDeltaQueue),
@@ -76,7 +76,6 @@ public class OSOperationRepo: NSObject {
 
     private func pollFlushQueue() {
         DispatchQueue.global().asyncAfter(deadline: .now() + .seconds(pollIntervalSeconds)) { [weak self] in
-            print("🔥 OSOperationRepo pollFlushQueue: begin flush")
             self?.flushDeltaQueue()
             self?.pollFlushQueue()
         }
@@ -101,7 +100,7 @@ public class OSOperationRepo: NSObject {
             return
         }
         start()
-        print("🔥 OSOperationRepo enqueueDelta: \(delta)")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSOperationRepo enqueueDelta: \(delta)")
         deltaQueue.append(delta)
 
         // Persist the deltas (including new delta) to storage
@@ -113,7 +112,10 @@ public class OSOperationRepo: NSObject {
             return
         }
         start()
-        print("🔥 OSOperationRepo flushDeltaQueue with queue: \(deltaQueue)")
+        if (!deltaQueue.isEmpty) {
+            
+            OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSOperationRepo flushDeltaQueue with queue: \(deltaQueue)")
+        }
 
         var index = 0
         for delta in deltaQueue {

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSIdentityModel.swift

@@ -68,15 +68,13 @@ class OSIdentityModel: OSModel {
     // MARK: - Alias Methods
 
     func addAliases(_ aliases: [String: String]) {
-        print("🔥 OSIdentityModel.addAliases \(aliases).")
         for (label, id) in aliases {
             self.aliases[label] = id
         }
         self.set(property: "aliases", newValue: aliases)
     }
 
     func removeAliases(_ labels: [String]) {
-        print("🔥 OSIdentityModel.removeAliases \(labels).")
         var aliasesToSend: [String: String] = [:]
         for label in labels {
             self.aliases.removeValue(forKey: label)
@@ -86,7 +84,7 @@ class OSIdentityModel: OSModel {
     }
 
     public override func hydrateModel(_ response: [String: Any]) {
-        print("🔥 OSIdentityModel hydrateModel()")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSIdentityModel hydrateModel()")
         for property in response {
             switch property.key {
             case "external_id":

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSIdentityOperationExecutor.swift

@@ -50,7 +50,7 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
     }
 
     func enqueueDelta(_ delta: OSDelta) {
-        print("🔥 OSIdentityOperationExecutor enqueueDelta: \(delta)")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSIdentityOperationExecutor enqueueDelta: \(delta)")
         deltaQueue.append(delta)
     }
 
@@ -59,6 +59,9 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
     }
 
     func processDeltaQueue() {
+        if (!deltaQueue.isEmpty) {
+            OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSIdentityOperationExecutor processDeltaQueue with queue: \(deltaQueue)")
+        }
         for delta in deltaQueue {
             guard let model = delta.model as? OSIdentityModel,
                   let aliases = delta.value as? [String: String]
@@ -81,7 +84,7 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
 
             default:
                 // Log error
-                print("🔥 OSIdentityOperationExecutor met incompatible OSDelta type.")
+                OneSignalLog.onesignalLog(.LL_DEBUG, message: "OSIdentityOperationExecutor met incompatible OSDelta type: \(delta)")
             }
         }
 
@@ -96,7 +99,7 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
     }
 
     func enqueueRequest(_ request: OneSignalRequest) {
-        print("🔥 OSIdentityOperationExecutor enqueueRequest: \(request)")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSIdentityOperationExecutor enqueueRequest: \(request)")
         requestQueue.append(request)
     }
 
@@ -117,7 +120,8 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
     }
 
     func executeAddAliasesRequest(_ request: OSRequestAddAliases) {
-        print("🔥 OSIdentityOperationExecutor: executeAddAliasesRequest making request: \(request)")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSIdentityOperationExecutor: executeAddAliasesRequest making request: \(request)")
+
         OneSignalClient.shared().execute(request) { result in
             // Mock a response
             let response = ["onesignalId": UUID().uuidString, "label01": "id01"]
@@ -138,7 +142,8 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
     }
 
     func executeRemoveAliasRequest(_ request: OSRequestRemoveAlias) {
-        print("🔥 OSIdentityOperationExecutor: executeRemoveAliasRequest making request: \(request)")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSIdentityOperationExecutor: executeRemoveAliasRequest making request: \(request)")
+
         OneSignalClient.shared().execute(request) { result in
 
             // Mock a response

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSPropertyOperationExecutor.swift

@@ -50,7 +50,7 @@ class OSPropertyOperationExecutor: OSOperationExecutor {
     }
 
     func enqueueDelta(_ delta: OSDelta) {
-        print("🔥 OSPropertyOperationExecutor enqueue delta\(delta)")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSPropertyOperationExecutor enqueue delta\(delta)")
         deltaQueue.append(delta)
     }
 
@@ -59,6 +59,9 @@ class OSPropertyOperationExecutor: OSOperationExecutor {
     }
 
     func processDeltaQueue() {
+        if (!deltaQueue.isEmpty) {
+            OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSPropertyOperationExecutor processDeltaQueue with queue: \(deltaQueue)")
+        }
         for delta in deltaQueue {
             guard let model = delta.model as? OSPropertiesModel else {
                 // Log error
@@ -84,7 +87,7 @@ class OSPropertyOperationExecutor: OSOperationExecutor {
     }
 
     func enqueueRequest(_ request: OneSignalRequest) {
-        print("🔥 OSPropertyOperationExecutor enqueueRequest: \(request)")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSPropertyOperationExecutor enqueueRequest: \(request)")
         requestQueue.append(request)
     }
 
@@ -104,7 +107,7 @@ class OSPropertyOperationExecutor: OSOperationExecutor {
         guard request.prepareForExecution() else {
             return
         }
-        print("🔥 OSPropertyOperationExecutor: executeUpdatePropertiesRequest making request: \(request)")
+        OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSPropertyOperationExecutor: executeUpdatePropertiesRequest making request: \(request)")
         OneSignalClient.shared().execute(request) { result in
 
             // On success, remove request from cache, and hydrate model