Skip to content

Commit 8d0d088

Browse files
committed
Extract out User Manager Loggable extension for file length
1 parent 01fde6f commit 8d0d088

File tree

3 files changed

+83
-50
lines changed

3 files changed

+83
-50
lines changed

iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
3C47A975292642B100312125 /* OneSignalConfigManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C47A973292642B100312125 /* OneSignalConfigManager.m */; };
8989
3C4F9E4428A4466C009F453A /* OSOperationRepo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C4F9E4328A4466C009F453A /* OSOperationRepo.swift */; };
9090
3C5117172B15C31E00563465 /* OSUserState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C5117162B15C31E00563465 /* OSUserState.swift */; };
91+
3C5929E32CAD9EC50020D6FF /* OneSignalUserManagerImpl+OSLoggable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C5929E22CAD9EC50020D6FF /* OneSignalUserManagerImpl+OSLoggable.swift */; };
9192
3C62999F2BEEA34800649187 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 3C62999E2BEEA34800649187 /* PrivacyInfo.xcprivacy */; };
9293
3C6299A12BEEA38100649187 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 3C6299A02BEEA38100649187 /* PrivacyInfo.xcprivacy */; };
9394
3C6299A32BEEA3CC00649187 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 3C6299A22BEEA3CC00649187 /* PrivacyInfo.xcprivacy */; };
@@ -1249,6 +1250,7 @@
12491250
3C47A973292642B100312125 /* OneSignalConfigManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OneSignalConfigManager.m; sourceTree = "<group>"; };
12501251
3C4F9E4328A4466C009F453A /* OSOperationRepo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSOperationRepo.swift; sourceTree = "<group>"; };
12511252
3C5117162B15C31E00563465 /* OSUserState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSUserState.swift; sourceTree = "<group>"; };
1253+
3C5929E22CAD9EC50020D6FF /* OneSignalUserManagerImpl+OSLoggable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OneSignalUserManagerImpl+OSLoggable.swift"; sourceTree = "<group>"; };
12521254
3C62999E2BEEA34800649187 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
12531255
3C6299A02BEEA38100649187 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
12541256
3C6299A22BEEA3CC00649187 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
@@ -2527,6 +2529,7 @@
25272529
3C3130E52CA385B700906665 /* Public */,
25282530
DE69E1A9282ED8790090BB3D /* UnitTestApp-Bridging-Header.h */,
25292531
DE69E1AA282ED8790090BB3D /* OneSignalUserManagerImpl.swift */,
2532+
3C5929E22CAD9EC50020D6FF /* OneSignalUserManagerImpl+OSLoggable.swift */,
25302533
3C0EF49D28A1DBCB00E5434B /* OSUserInternalImpl.swift */,
25312534
3C277D7D2BD76E0000857606 /* OSIdentityModelRepo.swift */,
25322535
);
@@ -4328,6 +4331,7 @@
43284331
3CE795F928DB99B500736BD4 /* OSSubscriptionModelStoreListener.swift in Sources */,
43294332
DE69E1AC282ED87A0090BB3D /* OneSignalUserManagerImpl.swift in Sources */,
43304333
DE1DD0602C87D87B00787071 /* OSJwtInvalidatedEvent.swift in Sources */,
4334+
3C5929E32CAD9EC50020D6FF /* OneSignalUserManagerImpl+OSLoggable.swift in Sources */,
43314335
3C9AD6CF2B228B7800BC1540 /* OSRequestAddAliases.swift in Sources */,
43324336
3C9AD6D32B228BB000BC1540 /* OSRequestUpdateProperties.swift in Sources */,
43334337
3C9AD6CD2B228B6300BC1540 /* OSRequestFetchUser.swift in Sources */,
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
/*
2+
Modified MIT License
3+
4+
Copyright 2024 OneSignal
5+
6+
Permission is hereby granted, free of charge, to any person obtaining a copy
7+
of this software and associated documentation files (the "Software"), to deal
8+
in the Software without restriction, including without limitation the rights
9+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
copies of the Software, and to permit persons to whom the Software is
11+
furnished to do so, subject to the following conditions:
12+
13+
1. The above copyright notice and this permission notice shall be included in
14+
all copies or substantial portions of the Software.
15+
16+
2. All copies of substantial portions of the Software may only be used in connection
17+
with services provided by OneSignal.
18+
19+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
20+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
21+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
22+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
23+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
24+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
25+
THE SOFTWARE.
26+
*/
27+
28+
import OneSignalCore
29+
import OneSignalOSCore
30+
31+
extension OneSignalUserManagerImpl: OSLoggable {
32+
@objc public func logSelf() {
33+
print("💛 _user: \(String(describing: _user))")
34+
print(
35+
"""
36+
💛 identityModel:
37+
aliases: \(String(describing: _user?.identityModel.aliases))
38+
jwt: \(String(describing: _user?.identityModel.jwtBearerToken))
39+
modelId: \(String(describing: _user?.identityModel.modelId))
40+
"""
41+
)
42+
print(
43+
"""
44+
💛 propertiesModel:
45+
tags: \(String(describing: _user?.propertiesModel.tags))
46+
language: \(String(describing: _user?.propertiesModel.language))
47+
modelId: \(String(describing: _user?.propertiesModel.modelId))
48+
"""
49+
)
50+
let subscriptionModels = subscriptionModelStore.getModels().values
51+
for sub in subscriptionModels {
52+
print(
53+
"""
54+
💛 subscription model from store
55+
addess: \(String(describing: sub.address))
56+
subscriptionId: \(String(describing: sub.subscriptionId))
57+
enabled: \(sub.enabled)
58+
modelId: \(sub.modelId)
59+
"""
60+
)
61+
}
62+
let pushSubModel = pushSubscriptionModelStore.getModel(key: OS_PUSH_SUBSCRIPTION_MODEL_KEY)
63+
print(
64+
"""
65+
💛 push sub model from store
66+
token: \(String(describing: pushSubModel?.address))
67+
subscriptionId: \(String(describing: pushSubModel?.subscriptionId))
68+
enabled: \(String(describing: pushSubModel?.enabled))
69+
notification_types: \(String(describing: pushSubModel?.notificationTypes))
70+
optedIn: \(String(describing: pushSubModel?.optedIn))
71+
modelId: \(String(describing: pushSubModel?.modelId))
72+
"""
73+
)
74+
operationRepo.logSelf()
75+
userExecutor?.logSelf()
76+
identityModelRepo.logSelf()
77+
print("")
78+
}
79+
}

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OneSignalUserManagerImpl.swift

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -950,53 +950,3 @@ extension OneSignalUserManagerImpl: OneSignalNotificationsDelegate {
950950
user.pushSubscriptionModel.address = pushToken
951951
}
952952
}
953-
954-
extension OneSignalUserManagerImpl: OSLoggable {
955-
@objc public func logSelf() {
956-
print("💛 _user: \(String(describing: _user))")
957-
print(
958-
"""
959-
💛 identityModel:
960-
aliases: \(String(describing: _user?.identityModel.aliases))
961-
jwt: \(String(describing: _user?.identityModel.jwtBearerToken))
962-
modelId: \(String(describing: _user?.identityModel.modelId))
963-
"""
964-
)
965-
print(
966-
"""
967-
💛 propertiesModel:
968-
tags: \(String(describing: _user?.propertiesModel.tags))
969-
language: \(String(describing: _user?.propertiesModel.language))
970-
modelId: \(String(describing: _user?.propertiesModel.modelId))
971-
"""
972-
)
973-
let subscriptionModels = subscriptionModelStore.getModels().values
974-
for sub in subscriptionModels {
975-
print(
976-
"""
977-
💛 subscription model from store
978-
addess: \(String(describing: sub.address))
979-
subscriptionId: \(String(describing: sub.subscriptionId))
980-
enabled: \(sub.enabled)
981-
modelId: \(sub.modelId)
982-
"""
983-
)
984-
}
985-
let pushSubModel = pushSubscriptionModelStore.getModel(key: OS_PUSH_SUBSCRIPTION_MODEL_KEY)
986-
print(
987-
"""
988-
💛 push sub model from store
989-
token: \(String(describing: pushSubModel?.address))
990-
subscriptionId: \(String(describing: pushSubModel?.subscriptionId))
991-
enabled: \(String(describing: pushSubModel?.enabled))
992-
notification_types: \(String(describing: pushSubModel?.notificationTypes))
993-
optedIn: \(String(describing: pushSubModel?.optedIn))
994-
modelId: \(String(describing: pushSubModel?.modelId))
995-
"""
996-
)
997-
operationRepo.logSelf()
998-
userExecutor?.logSelf()
999-
identityModelRepo.logSelf()
1000-
print("")
1001-
}
1002-
}

0 commit comments

Comments
 (0)