Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP unit test merge taking a look #1347

Closed
wants to merge 9 commits into from
Closed

WIP unit test merge taking a look #1347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9e020fd
update some imports
nan-li Dec 7, 2023
86466bd
update naming for some user model test methods
nan-li Dec 7, 2023
5fe92b8
comment out entire test files
nan-li Feb 27, 2023
68cf664
running `swiftlint --fix`
nan-li Dec 7, 2023
3785cfd
swiftlint split OSUserRequests.swift
nan-li Dec 7, 2023
a1dbab0
Update `OneSignalOSCore` build configs for `Test`
nan-li Dec 7, 2023
0c0982d
Set Unit Test minimum deployment to 11
nan-li Dec 7, 2023
bf01202
update targets for files to expose to unit tests
nan-li Dec 7, 2023
ae44997
commenting out more unit test classes
nan-li Mar 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 88 additions & 6 deletions iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,15 @@
3C8E6DF928A6D89E0031E48A /* OSOperationExecutor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C8E6DF828A6D89E0031E48A /* OSOperationExecutor.swift */; };
3C8E6DFF28AB09AE0031E48A /* OSPropertyOperationExecutor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C8E6DFE28AB09AE0031E48A /* OSPropertyOperationExecutor.swift */; };
3C8E6E0128AC0BA10031E48A /* OSIdentityOperationExecutor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C8E6E0028AC0BA10031E48A /* OSIdentityOperationExecutor.swift */; };
3C9AD6A22B226C4E00BC1540 /* OSUserExecutor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C9AD6A12B226C4E00BC1540 /* OSUserExecutor.swift */; };
3C9AD6AA2B22792D00BC1540 /* OneSignalLiveActivityController.m in Sources */ = {isa = PBXBuildFile; fileRef = 944F7ECE296F890900AEBA54 /* OneSignalLiveActivityController.m */; };
3C9AD6AB2B22792E00BC1540 /* OneSignalLiveActivityController.m in Sources */ = {isa = PBXBuildFile; fileRef = 944F7ECE296F890900AEBA54 /* OneSignalLiveActivityController.m */; };
3C9AD6AC2B22798400BC1540 /* OneSignalLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEBAADF92A420A3700BF2C1C /* OneSignalLocation.framework */; };
3C9AD6AD2B22798400BC1540 /* OneSignalLocation.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DEBAADF92A420A3700BF2C1C /* OneSignalLocation.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
3C9AD6B12B2279AC00BC1540 /* OneSignalInAppMessages.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEBAAE282A4211D900BF2C1C /* OneSignalInAppMessages.framework */; };
3C9AD6B22B2279AC00BC1540 /* OneSignalInAppMessages.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DEBAAE282A4211D900BF2C1C /* OneSignalInAppMessages.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
3C9AD6B52B227A5900BC1540 /* OneSignalNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEF784292912DEB600A1F3A5 /* OneSignalNotifications.framework */; };
3C9AD6B62B227A5900BC1540 /* OneSignalNotifications.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DEF784292912DEB600A1F3A5 /* OneSignalNotifications.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
3CA6CE0A28E4F19B00CA0585 /* OSUserRequests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CA6CE0928E4F19B00CA0585 /* OSUserRequests.swift */; };
3CC9A6342AFA1FDE008F68FD /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 3CC9A6332AFA1FDD008F68FD /* PrivacyInfo.xcprivacy */; };
3CC9A6362AFA26E7008F68FD /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 3CC9A6352AFA26E7008F68FD /* PrivacyInfo.xcprivacy */; };
Expand Down Expand Up @@ -489,6 +498,27 @@
remoteGlobalIDString = 3C115160289A259500565C41;
remoteInfo = OneSignalOSCore;
};
3C9AD6AE2B22798400BC1540 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 37747F8B19147D6400558FAD /* Project object */;
proxyType = 1;
remoteGlobalIDString = DEBAADF82A420A3700BF2C1C;
remoteInfo = OneSignalLocation;
};
3C9AD6B32B2279AC00BC1540 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 37747F8B19147D6400558FAD /* Project object */;
proxyType = 1;
remoteGlobalIDString = DEBAAE272A4211D900BF2C1C;
remoteInfo = OneSignalInAppMessages;
};
3C9AD6B72B227A5900BC1540 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 37747F8B19147D6400558FAD /* Project object */;
proxyType = 1;
remoteGlobalIDString = DEF784282912DEB600A1F3A5;
remoteInfo = OneSignalNotifications;
};
DE12F3F4289B28C4002F63AA /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 37747F8B19147D6400558FAD /* Project object */;
Expand Down Expand Up @@ -684,6 +714,19 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
3C9AD6B02B22798400BC1540 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
3C9AD6B62B227A5900BC1540 /* OneSignalNotifications.framework in Embed Frameworks */,
3C9AD6B22B2279AC00BC1540 /* OneSignalInAppMessages.framework in Embed Frameworks */,
3C9AD6AD2B22798400BC1540 /* OneSignalLocation.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
DEA4B45E2888C1D000E9FE12 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -749,6 +792,7 @@
3C8E6DF828A6D89E0031E48A /* OSOperationExecutor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSOperationExecutor.swift; sourceTree = "<group>"; };
3C8E6DFE28AB09AE0031E48A /* OSPropertyOperationExecutor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSPropertyOperationExecutor.swift; sourceTree = "<group>"; };
3C8E6E0028AC0BA10031E48A /* OSIdentityOperationExecutor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSIdentityOperationExecutor.swift; sourceTree = "<group>"; };
3C9AD6A12B226C4E00BC1540 /* OSUserExecutor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSUserExecutor.swift; sourceTree = "<group>"; };
3CA6CE0928E4F19B00CA0585 /* OSUserRequests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSUserRequests.swift; sourceTree = "<group>"; };
3CC9A6332AFA1FDD008F68FD /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
3CC9A6352AFA26E7008F68FD /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1148,9 +1192,12 @@
DEA4B4642888C4E200E9FE12 /* OneSignalOutcomes.framework in Frameworks */,
DEA4B45A2888BFAB00E9FE12 /* OneSignalCore.framework in Frameworks */,
9D348537233C669E00EB81C9 /* CoreLocation.framework in Frameworks */,
3C9AD6B52B227A5900BC1540 /* OneSignalNotifications.framework in Frameworks */,
9D3300FA23149DAE000F0A83 /* CoreGraphics.framework in Frameworks */,
CACBAAAC218A662B000ACAA5 /* WebKit.framework in Frameworks */,
3C9AD6AC2B22798400BC1540 /* OneSignalLocation.framework in Frameworks */,
911E2CC81E399834003112A4 /* UserNotifications.framework in Frameworks */,
3C9AD6B12B2279AC00BC1540 /* OneSignalInAppMessages.framework in Frameworks */,
911E2CC61E398B97003112A4 /* UIKit.framework in Frameworks */,
911E2CC51E398B53003112A4 /* SystemConfiguration.framework in Frameworks */,
);
Expand Down Expand Up @@ -1607,6 +1654,7 @@
3CE795F828DB99B500736BD4 /* OSSubscriptionModelStoreListener.swift */,
3CE795FA28DBDCE700736BD4 /* OSSubscriptionOperationExecutor.swift */,
3CA6CE0928E4F19B00CA0585 /* OSUserRequests.swift */,
3C9AD6A12B226C4E00BC1540 /* OSUserExecutor.swift */,
3C5117162B15C31E00563465 /* OSUserState.swift */,
);
path = Source;
Expand Down Expand Up @@ -2339,11 +2387,15 @@
911E2CB61E398AB3003112A4 /* Sources */,
911E2CB71E398AB3003112A4 /* Frameworks */,
911E2CB81E398AB3003112A4 /* Resources */,
3C9AD6B02B22798400BC1540 /* Embed Frameworks */,
);
buildRules = (
);
dependencies = (
DEF5CD12253932260003E9CC /* PBXTargetDependency */,
3C9AD6AF2B22798400BC1540 /* PBXTargetDependency */,
3C9AD6B42B2279AC00BC1540 /* PBXTargetDependency */,
3C9AD6B82B227A5900BC1540 /* PBXTargetDependency */,
);
name = UnitTests;
productName = UnitTests;
Expand Down Expand Up @@ -2780,6 +2832,7 @@
DE16C14424D3724700670EFA /* OneSignalLifecycleObserver.m in Sources */,
9124123E1E73342200E41FD7 /* UIApplicationDelegate+OneSignal.m in Sources */,
CAB4112920852E48005A70D1 /* DelayedConsentInitializationParameters.m in Sources */,
3C9AD6AA2B22792D00BC1540 /* OneSignalLiveActivityController.m in Sources */,
CA1A6E7020DC2E73001C41B9 /* OneSignalDialogRequest.m in Sources */,
912412321E73342200E41FD7 /* OneSignalTracker.m in Sources */,
7AFE856B2368DDB80091D6A5 /* OSFocusCallParams.m in Sources */,
Expand Down Expand Up @@ -2896,6 +2949,7 @@
912412401E73342200E41FD7 /* UIApplicationDelegate+OneSignal.m in Sources */,
CACBAAAA218A65AE000ACAA5 /* InAppMessagingTests.m in Sources */,
4529DEE71FA82CDC00CEAB1D /* UNUserNotificationCenterOverrider.m in Sources */,
3C9AD6AB2B22792E00BC1540 /* OneSignalLiveActivityController.m in Sources */,
3C2C7DC6288E00AA0020F9AE /* UserModelObjcTests.m in Sources */,
4529DEDB1FA8284E00CEAB1D /* NSDataOverrider.m in Sources */,
A662399326850DDE00D52FD8 /* LanguageTest.m in Sources */,
Expand Down Expand Up @@ -2935,6 +2989,7 @@
3CF862A228A197D200776CA4 /* OSPropertiesModelStoreListener.swift in Sources */,
3C0EF49E28A1DBCB00E5434B /* OSUserInternalImpl.swift in Sources */,
3C8E6DFF28AB09AE0031E48A /* OSPropertyOperationExecutor.swift in Sources */,
3C9AD6A22B226C4E00BC1540 /* OSUserExecutor.swift in Sources */,
3C2C7DC8288F3C020020F9AE /* OSSubscriptionModel.swift in Sources */,
3CF8629E28A183F900776CA4 /* OSIdentityModel.swift in Sources */,
3CE795FB28DBDCE700736BD4 /* OSSubscriptionOperationExecutor.swift in Sources */,
Expand Down Expand Up @@ -3097,6 +3152,21 @@
target = 3C115160289A259500565C41 /* OneSignalOSCore */;
targetProxy = 3C115199289AF86C00565C41 /* PBXContainerItemProxy */;
};
3C9AD6AF2B22798400BC1540 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = DEBAADF82A420A3700BF2C1C /* OneSignalLocation */;
targetProxy = 3C9AD6AE2B22798400BC1540 /* PBXContainerItemProxy */;
};
3C9AD6B42B2279AC00BC1540 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = DEBAAE272A4211D900BF2C1C /* OneSignalInAppMessages */;
targetProxy = 3C9AD6B32B2279AC00BC1540 /* PBXContainerItemProxy */;
};
3C9AD6B82B227A5900BC1540 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = DEF784282912DEB600A1F3A5 /* OneSignalNotifications */;
targetProxy = 3C9AD6B72B227A5900BC1540 /* PBXContainerItemProxy */;
};
DE12F3F5289B28C4002F63AA /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 3C115160289A259500565C41 /* OneSignalOSCore */;
Expand Down Expand Up @@ -3495,7 +3565,7 @@
GCC_PREPROCESSOR_DEFINITIONS = OS_TEST;
HEADER_SEARCH_PATHS = $CONFIGURATION_TEMP_DIR/UnitTests.build/DerivedSources;
INFOPLIST_FILE = UnitTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.1;
IPHONEOS_DEPLOYMENT_TARGET = 11;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.15;
MTL_ENABLE_DEBUG_INFO = NO;
Expand Down Expand Up @@ -3664,7 +3734,7 @@
GCC_PREPROCESSOR_DEFINITIONS = OS_TEST;
HEADER_SEARCH_PATHS = $CONFIGURATION_TEMP_DIR/UnitTests.build/DerivedSources;
INFOPLIST_FILE = UnitTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.1;
IPHONEOS_DEPLOYMENT_TARGET = 11;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.15;
MTL_ENABLE_DEBUG_INFO = NO;
Expand Down Expand Up @@ -3833,7 +3903,7 @@
GCC_PREPROCESSOR_DEFINITIONS = OS_TEST;
HEADER_SEARCH_PATHS = $CONFIGURATION_TEMP_DIR/UnitTests.build/DerivedSources;
INFOPLIST_FILE = UnitTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.1;
IPHONEOS_DEPLOYMENT_TARGET = 11;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.15;
MTL_ENABLE_DEBUG_INFO = NO;
Expand Down Expand Up @@ -3920,7 +3990,7 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = OS_TEST;
INFOPLIST_FILE = UnitTestApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 11;
"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 13.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
Expand Down Expand Up @@ -5034,13 +5104,25 @@
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
CLANG_ENABLE_MODULES = YES;
COPY_PHASE_STRIP = NO;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 99SW8E36CT;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_TESTABILITY = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = OneSignalOSCoreFramework/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
OTHER_CFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.OneSignalOSCore;
PRODUCT_NAME = OneSignalOSCore;
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Test;
};
Expand Down Expand Up @@ -5076,7 +5158,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_PREPROCESSOR_DEFINITIONS = OS_TEST;
INFOPLIST_FILE = UnitTestApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 11;
"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 13.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = NO;
Expand Down Expand Up @@ -5125,7 +5207,7 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = OS_TEST;
INFOPLIST_FILE = UnitTestApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 11;
"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 13.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
Expand Down
10 changes: 5 additions & 5 deletions iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSOperationRepo.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,12 @@ public class OSOperationRepo: NSObject {
OneSignalLog.onesignalLog(.LL_DEBUG, message: "OSOperationRepo not flushing queue due to being paused")
return
}

guard !OneSignalConfigManager.shouldAwaitAppIdAndLogMissingPrivacyConsent(forMethod: nil) else {
return
}
if (inBackground) {

if inBackground {
OSBackgroundTaskManager.beginBackgroundTask(OPERATION_REPO_BACKGROUND_TASK)
}

Expand Down Expand Up @@ -148,8 +148,8 @@ public class OSOperationRepo: NSObject {
for executor in executors {
executor.processDeltaQueue(inBackground: inBackground)
}
if (inBackground) {

if inBackground {
OSBackgroundTaskManager.endBackgroundTask(OPERATION_REPO_BACKGROUND_TASK)
}

Expand Down
8 changes: 4 additions & 4 deletions iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSIdentityModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class OSIdentityModel: OSModel {
OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSIdentityModel hydrateModel()")
var newOnesignalId: String?
var newExternalId: String?

for property in response {
switch property.key {
case "external_id":
Expand All @@ -108,18 +108,18 @@ class OSIdentityModel: OSModel {
}
fireUserStateChanged(newOnesignalId: newOnesignalId, newExternalId: newExternalId)
}

/**
Fires the user observer if `onesignal_id` OR `external_id` has changed from the previous snapshot (previous hydration).
*/
private func fireUserStateChanged(newOnesignalId: String?, newExternalId: String?) {
let prevOnesignalId = OneSignalUserDefaults.initShared().getSavedString(forKey: OS_SNAPSHOT_ONESIGNAL_ID, defaultValue: nil)
let prevExternalId = OneSignalUserDefaults.initShared().getSavedString(forKey: OS_SNAPSHOT_EXTERNAL_ID, defaultValue: nil)

guard prevOnesignalId != newOnesignalId || prevExternalId != newExternalId else {
return
}

OneSignalUserDefaults.initShared().saveString(forKey: OS_SNAPSHOT_ONESIGNAL_ID, withValue: newOnesignalId)
OneSignalUserDefaults.initShared().saveString(forKey: OS_SNAPSHOT_EXTERNAL_ID, withValue: newExternalId)

Expand Down
20 changes: 10 additions & 10 deletions iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSIdentityOperationExecutor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,16 +175,16 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSIdentityOperationExecutor: executeAddAliasesRequest making request: \(request)")

let backgroundTaskIdentifier = IDENTITY_EXECUTOR_BACKGROUND_TASK + UUID().uuidString
if (inBackground) {
if inBackground {
OSBackgroundTaskManager.beginBackgroundTask(backgroundTaskIdentifier)
}

OneSignalClient.shared().execute(request) { _ in
// No hydration from response
// On success, remove request from cache
self.addRequestQueue.removeAll(where: { $0 == request})
OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_IDENTITY_EXECUTOR_ADD_REQUEST_QUEUE_KEY, withValue: self.addRequestQueue)
if (inBackground) {
if inBackground {
OSBackgroundTaskManager.endBackgroundTask(backgroundTaskIdentifier)
}
} onFailure: { error in
Expand All @@ -198,7 +198,7 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
// Logout if the user in the SDK is the same
guard OneSignalUserManagerImpl.sharedInstance.isCurrentUser(request.identityModel)
else {
if (inBackground) {
if inBackground {
OSBackgroundTaskManager.endBackgroundTask(backgroundTaskIdentifier)
}
return
Expand All @@ -212,7 +212,7 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_IDENTITY_EXECUTOR_ADD_REQUEST_QUEUE_KEY, withValue: self.addRequestQueue)
}
}
if (inBackground) {
if inBackground {
OSBackgroundTaskManager.endBackgroundTask(backgroundTaskIdentifier)
}
}
Expand All @@ -230,21 +230,21 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSIdentityOperationExecutor: executeRemoveAliasRequest making request: \(request)")

let backgroundTaskIdentifier = IDENTITY_EXECUTOR_BACKGROUND_TASK + UUID().uuidString
if (inBackground) {
if inBackground {
OSBackgroundTaskManager.beginBackgroundTask(backgroundTaskIdentifier)
}

OneSignalClient.shared().execute(request) { _ in
// There is nothing to hydrate
// On success, remove request from cache
self.removeRequestQueue.removeAll(where: { $0 == request})
OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_IDENTITY_EXECUTOR_REMOVE_REQUEST_QUEUE_KEY, withValue: self.removeRequestQueue)
if (inBackground) {
if inBackground {
OSBackgroundTaskManager.endBackgroundTask(backgroundTaskIdentifier)
}
} onFailure: { error in
OneSignalLog.onesignalLog(.LL_ERROR, message: "OSIdentityOperationExecutor remove alias request failed with error: \(error.debugDescription)")

if let nsError = error as? NSError {
let responseType = OSNetworkingUtils.getResponseStatusType(nsError.code)
if responseType != .retryable {
Expand All @@ -254,7 +254,7 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_IDENTITY_EXECUTOR_REMOVE_REQUEST_QUEUE_KEY, withValue: self.removeRequestQueue)
}
}
if (inBackground) {
if inBackground {
OSBackgroundTaskManager.endBackgroundTask(backgroundTaskIdentifier)
}
}
Expand Down
4 changes: 2 additions & 2 deletions iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSPropertiesModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ class OSPropertiesModel: OSModel {
self.set(property: "location", newValue: location)
}
}

var timezoneId = TimeZone.current.identifier

var tags: [String: String] = [:]

// MARK: - Initialization
Expand Down
Loading
Loading