internal dump method helper

nan-li · nan-li · commit 0ba7ad5fdaec · 2024-08-22T10:56:27.000-07:00
* internal for now, put in information you want to log for each product that conforms to OSLoggable
diff --git a/iOS_SDK/OneSignalDevApp/OneSignalDevApp/SwiftTest.swift b/iOS_SDK/OneSignalDevApp/OneSignalDevApp/SwiftTest.swift
@@ -32,5 +32,6 @@ class SwiftTest: NSObject {
     func testSwiftUserModel() {
         let token1 = OneSignal.User.pushSubscription.token
         let token = OneSignal.User.pushSubscription.token
+        OneSignal.Debug._dump()
     }
 }
diff --git a/iOS_SDK/OneSignalDevApp/OneSignalDevApp/ViewController.m b/iOS_SDK/OneSignalDevApp/OneSignalDevApp/ViewController.m
@@ -133,6 +133,7 @@ - (IBAction)sendTagButton:(id)sender {
 - (IBAction)getTagsButton:(id)sender {
     NSDictionary<NSString *, NSString*> *tags = [OneSignal.User getTags];
     NSLog(@"Tags: %@", tags);
+    [OneSignal.Debug _dump];
 }
 
 - (IBAction)sendTagsButton:(id)sender {
diff --git a/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj b/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj
@@ -56,6 +56,7 @@
 		3C0151922C2E298F0079E076 /* OneSignalInAppMessages.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEBAAE282A4211D900BF2C1C /* OneSignalInAppMessages.framework */; };
 		3C01519C2C2E29F90079E076 /* IAMRequestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C01519B2C2E29F90079E076 /* IAMRequestTests.m */; };
 		3C0EF49E28A1DBCB00E5434B /* OSUserInternalImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C0EF49D28A1DBCB00E5434B /* OSUserInternalImpl.swift */; };
+		3C10E0632BF5651500A7B37F /* OSLoggable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C10E0622BF5651500A7B37F /* OSLoggable.swift */; };
 		3C115165289A259500565C41 /* OneSignalOSCore.docc in Sources */ = {isa = PBXBuildFile; fileRef = 3C115164289A259500565C41 /* OneSignalOSCore.docc */; };
 		3C115171289A259500565C41 /* OneSignalOSCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C115163289A259500565C41 /* OneSignalOSCore.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3C115185289ADE4F00565C41 /* OSModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C115184289ADE4F00565C41 /* OSModel.swift */; };
@@ -1211,6 +1212,7 @@
 		3C01518E2C2E298E0079E076 /* OneSignalInAppMessagesTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OneSignalInAppMessagesTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		3C01519B2C2E29F90079E076 /* IAMRequestTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IAMRequestTests.m; sourceTree = "<group>"; };
 		3C0EF49D28A1DBCB00E5434B /* OSUserInternalImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OSUserInternalImpl.swift; sourceTree = "<group>"; };
+		3C10E0622BF5651500A7B37F /* OSLoggable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSLoggable.swift; sourceTree = "<group>"; };
 		3C115161289A259500565C41 /* OneSignalOSCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OneSignalOSCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		3C115163289A259500565C41 /* OneSignalOSCore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OneSignalOSCore.h; sourceTree = "<group>"; };
 		3C115164289A259500565C41 /* OneSignalOSCore.docc */ = {isa = PBXFileReference; lastKnownFileType = folder.documentationcatalog; path = OneSignalOSCore.docc; sourceTree = "<group>"; };
@@ -2068,6 +2070,7 @@
 				4710EA522B8FCFB200435356 /* OSDispatchQueue.swift */,
 				DEFB3E642BB7346D00E65DAD /* OSLiveActivities.swift */,
 				DEFB3E662BB735B500E65DAD /* OSStubLiveActivities.swift */,
+				3C10E0622BF5651500A7B37F /* OSLoggable.swift */,
 			);
 			path = Source;
 			sourceTree = "<group>";
@@ -4052,6 +4055,7 @@
 				DEFB3E652BB7346D00E65DAD /* OSLiveActivities.swift in Sources */,
 				3C4F9E4428A4466C009F453A /* OSOperationRepo.swift in Sources */,
 				3C11518B289ADEEB00565C41 /* OSEventProducer.swift in Sources */,
+				3C10E0632BF5651500A7B37F /* OSLoggable.swift in Sources */,
 				3C115165289A259500565C41 /* OneSignalOSCore.docc in Sources */,
 				3C115189289ADEA300565C41 /* OSModelStore.swift in Sources */,
 				3C115185289ADE4F00565C41 /* OSModel.swift in Sources */,
diff --git a/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalLog.h b/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalLog.h
@@ -39,9 +39,10 @@ typedef NS_ENUM(NSUInteger, ONE_S_LOG_LEVEL) {
 @protocol OSDebug <NSObject>
 + (void)setLogLevel:(ONE_S_LOG_LEVEL)logLevel;
 + (void)setAlertLevel:(ONE_S_LOG_LEVEL)logLevel NS_REFINED_FOR_SWIFT;
++ (void)_dump;
 @end
 
-@interface OneSignalLog : NSObject<OSDebug>
+@interface OneSignalLog : NSObject <OSDebug>
 + (Class<OSDebug>)Debug;
 + (void)onesignalLog:(ONE_S_LOG_LEVEL)logLevel message:(NSString* _Nonnull)message;
 + (ONE_S_LOG_LEVEL)getLogLevel;
diff --git a/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalLog.m b/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalLog.m
@@ -29,6 +29,10 @@
 #import "OneSignalLog.h"
 #import "OSDialogInstanceManager.h"
 
+/**
+ Implements the Log Level methods of protocol `OSDebug`.
+ The `_dump` method will be implemented in OneSignal module.
+ */
 @implementation OneSignalLog
 
 static ONE_S_LOG_LEVEL _nsLogLevel = ONE_S_LL_WARN;
@@ -46,6 +50,8 @@ + (void)setAlertLevel:(ONE_S_LOG_LEVEL)logLevel {
     _alertLogLevel = logLevel;
 }
 
++ (void)_dump {}
+
 + (void)onesignalLog:(ONE_S_LOG_LEVEL)logLevel message:(NSString* _Nonnull)message {
     onesignal_Log(logLevel, message);
 }
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSLoggable.swift b/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSLoggable.swift
@@ -0,0 +1,30 @@
+/*
+ Modified MIT License
+
+ Copyright 2024 OneSignal
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ 1. The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ 2. All copies of substantial portions of the Software may only be used in connection
+ with services provided by OneSignal.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ */
+
+public protocol OSLoggable {
+    func logSelf()
+}
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSOperationExecutor.swift b/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSOperationExecutor.swift
@@ -30,7 +30,7 @@ import OneSignalCore
 /**
  Concrete executors drop OSDeltas and Requests when initializing from the cache, when they cannot be connected to their respective models anymore. These cannot be sent, so they are dropped..
  */
-public protocol OSOperationExecutor {
+public protocol OSOperationExecutor: OSLoggable {
     var supportedDeltas: [String] { get }
     var deltaQueue: [OSDelta] { get }
 
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSOperationRepo.swift b/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSOperationRepo.swift
@@ -173,3 +173,9 @@ public class OSOperationRepo: NSObject {
         }
     }
 }
+
+extension OSOperationRepo: OSLoggable {
+    public func logSelf() {
+        // TODO: You fill in
+    }
+}
diff --git a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSIdentityOperationExecutor.swift b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSIdentityOperationExecutor.swift
@@ -293,3 +293,9 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
         }
     }
 }
+
+extension OSIdentityOperationExecutor: OSLoggable {
+    func logSelf() {
+        // TODO: You fill in
+    }
+}
diff --git a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSPropertyOperationExecutor.swift b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSPropertyOperationExecutor.swift
@@ -288,3 +288,9 @@ class OSPropertyOperationExecutor: OSOperationExecutor {
         }
     }
 }
+
+extension OSPropertyOperationExecutor: OSLoggable {
+    func logSelf() {
+        // TODO: You fill in
+    }
+}
diff --git a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSSubscriptionOperationExecutor.swift b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSSubscriptionOperationExecutor.swift
@@ -421,3 +421,9 @@ class OSSubscriptionOperationExecutor: OSOperationExecutor {
         }
     }
 }
+
+extension OSSubscriptionOperationExecutor: OSLoggable {
+    func logSelf() {
+        // TODO: You fill in
+    }
+}
diff --git a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSUserExecutor.swift b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSUserExecutor.swift
@@ -600,3 +600,9 @@ extension OSUserExecutor {
         return response?["identity"] as? [String: String]
     }
 }
+
+extension OSUserExecutor: OSLoggable {
+    func logSelf() {
+        // TODO: You fill in
+    }
+}
diff --git a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSIdentityModelRepo.swift b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSIdentityModelRepo.swift
@@ -26,6 +26,7 @@
  */
 
 import Foundation
+import OneSignalOSCore
 
 /**
  This class stores all Identity Models that are being used during an app session.
@@ -53,3 +54,9 @@ class OSIdentityModelRepo {
         }
     }
 }
+
+extension OSIdentityModelRepo: OSLoggable {
+    func logSelf() {
+        // TODO: You fill in
+    }
+}
diff --git a/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OneSignalUserManagerImpl.swift b/iOS_SDK/OneSignalSDK/OneSignalUser/Source/OneSignalUserManagerImpl.swift
@@ -873,3 +873,9 @@ extension OneSignalUserManagerImpl: OneSignalNotificationsDelegate {
         user.pushSubscriptionModel.address = pushToken
     }
 }
+
+extension OneSignalUserManagerImpl: OSLoggable {
+    @objc public func logSelf() {
+        // TODO: You fill in
+    }
+}
diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignal.m b/iOS_SDK/OneSignalSDK/Source/OneSignal.m
@@ -77,6 +77,17 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
 
+/**
+ Implements the `_dump` method of protocol `OSDebug`.
+ */
+@implementation OneSignalLog (OSLoggable)
++ (void)_dump {
+    NSLog(@"💛 calling LOG!");
+    [OneSignalUserManagerImpl.sharedInstance logSelf];
+    // And more ...
+}
+@end
+
 @interface OneSignal (SessionStatusDelegate)
 @end
 

Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,6 @@ class SwiftTest: NSObject {`
`32`	`32`	`func testSwiftUserModel() {`
`33`	`33`	`let token1 = OneSignal.User.pushSubscription.token`
`34`	`34`	`let token = OneSignal.User.pushSubscription.token`
	`35`	`+ OneSignal.Debug._dump()`
`35`	`36`	`}`
`36`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,7 @@ - (IBAction)sendTagButton:(id)sender {`
`133`	`133`	`- (IBAction)getTagsButton:(id)sender {`
`134`	`134`	`NSDictionary<NSString , NSString> *tags = [OneSignal.User getTags];`
`135`	`135`	`NSLog(@"Tags: %@", tags);`
	`136`	`+ [OneSignal.Debug _dump];`
`136`	`137`	`}`
`137`	`138`
`138`	`139`	`- (IBAction)sendTagsButton:(id)sender {`
Original file line number	Diff line number	Diff line change
`@@ -173,3 +173,9 @@ public class OSOperationRepo: NSObject {`
`173`	`173`	`}`
`174`	`174`	`}`
`175`	`175`	`}`
	`176`	`+`
	`177`	`+extension OSOperationRepo: OSLoggable {`
	`178`	`+ public func logSelf() {`
	`179`	`+ // TODO: You fill in`
	`180`	`+ }`
	`181`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -293,3 +293,9 @@ class OSIdentityOperationExecutor: OSOperationExecutor {`
`293`	`293`	`}`
`294`	`294`	`}`
`295`	`295`	`}`
	`296`	`+`
	`297`	`+extension OSIdentityOperationExecutor: OSLoggable {`
	`298`	`+ func logSelf() {`
	`299`	`+ // TODO: You fill in`
	`300`	`+ }`
	`301`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -288,3 +288,9 @@ class OSPropertyOperationExecutor: OSOperationExecutor {`
`288`	`288`	`}`
`289`	`289`	`}`
`290`	`290`	`}`
	`291`	`+`
	`292`	`+extension OSPropertyOperationExecutor: OSLoggable {`
	`293`	`+ func logSelf() {`
	`294`	`+ // TODO: You fill in`
	`295`	`+ }`
	`296`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -421,3 +421,9 @@ class OSSubscriptionOperationExecutor: OSOperationExecutor {`
`421`	`421`	`}`
`422`	`422`	`}`
`423`	`423`	`}`
	`424`	`+`
	`425`	`+extension OSSubscriptionOperationExecutor: OSLoggable {`
	`426`	`+ func logSelf() {`
	`427`	`+ // TODO: You fill in`
	`428`	`+ }`
	`429`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -600,3 +600,9 @@ extension OSUserExecutor {`
`600`	`600`	`return response?["identity"] as? [String: String]`
`601`	`601`	`}`
`602`	`602`	`}`
	`603`	`+`
	`604`	`+extension OSUserExecutor: OSLoggable {`
	`605`	`+ func logSelf() {`
	`606`	`+ // TODO: You fill in`
	`607`	`+ }`
	`608`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`*/`
`27`	`27`
`28`	`28`	`import Foundation`
	`29`	`+import OneSignalOSCore`
`29`	`30`
`30`	`31`	`/**`
`31`	`32`	`This class stores all Identity Models that are being used during an app session.`
`@@ -53,3 +54,9 @@ class OSIdentityModelRepo {`
`53`	`54`	`}`
`54`	`55`	`}`
`55`	`56`	`}`
	`57`	`+`
	`58`	`+extension OSIdentityModelRepo: OSLoggable {`
	`59`	`+ func logSelf() {`
	`60`	`+ // TODO: You fill in`
	`61`	`+ }`
	`62`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -873,3 +873,9 @@ extension OneSignalUserManagerImpl: OneSignalNotificationsDelegate {`
`873`	`873`	`user.pushSubscriptionModel.address = pushToken`
`874`	`874`	`}`
`875`	`875`	`}`
	`876`	`+`
	`877`	`+extension OneSignalUserManagerImpl: OSLoggable {`
	`878`	`+ @objc public func logSelf() {`
	`879`	`+ // TODO: You fill in`
	`880`	`+ }`
	`881`	`+}`