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

Jump to bottom

feat: add method to get device ID synchronously #490

Merged
merged 7 commits into from
Apr 4, 2024
Merged

feat: add method to get device ID synchronously #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cf0151d
feat: add method to get device ID synchronously
bgiori Apr 3, 2024
2e30d1c
fix: add sync for device ID
bgiori Apr 3, 2024
eca6cc2
fix: remove sync method, call initializeDeviceID from getDeviceId
bgiori Apr 4, 2024
2fc7f3e
test: add nil check and fix/update tests
bgiori Apr 4, 2024
f454d26
add another test for getDeviceId prior to initialize
bgiori Apr 4, 2024
819bba4
fix tests
bgiori Apr 4, 2024
b1bd536
remove test
bgiori Apr 4, 2024
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
15 changes: 10 additions & 5 deletions Sources/Amplitude/Amplitude.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1669,6 +1669,9 @@ - (NSString *)getAdSupportID {
}

- (NSString *)getDeviceId {
if (self.deviceId == nil) {
return [self initializeDeviceId];
}
return self.deviceId;
}

Expand All @@ -1677,11 +1680,13 @@ - (long long)getSessionId {
}

- (NSString *)initializeDeviceId {
if (self.deviceId == nil) {
self.deviceId = [self.dbHelper getValue:DEVICE_ID];
if (![self isValidDeviceId:self.deviceId]) {
self.deviceId = [self _getDeviceId];
[self.dbHelper insertOrReplaceKeyValue:DEVICE_ID value:self.deviceId];
@synchronized (self) {
if (self.deviceId == nil) {
self.deviceId = [self.dbHelper getValue:DEVICE_ID];
if (![self isValidDeviceId:self.deviceId]) {
self.deviceId = [self _getDeviceId];
[self.dbHelper insertOrReplaceKeyValue:DEVICE_ID value:self.deviceId];
}
}
}
return self.deviceId;
Expand Down
8 changes: 8 additions & 0 deletions Tests/AmplitudeTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1705,4 +1705,12 @@ - (void)testOpenURLFiresDeepLinkEvent {
XCTAssertEqualObjects([[event objectForKey:@"event_properties"] objectForKey:kAMPEventPropLinkUrl], @"https://test-app.com");
}

- (void)testGetDeviceIdAfterInit {
NSString *instanceName = @"testGetDeviceIdAfterInit";
Amplitude *client = [Amplitude instanceWithName:instanceName];
[client initializeApiKey:@"testGetDeviceIdAfterInit"];
NSString *deviceId = [client getDeviceId];
XCTAssertNotEqualObjects(deviceId, @"");
}

@end
3 changes: 0 additions & 3 deletions Tests/SetupTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,15 +115,12 @@ - (void)testUserPropertiesSet {

- (void)testSetDeviceId {
AMPDatabaseHelper *dbHelper = [AMPDatabaseHelper getDatabaseHelper];
NSString *initialDeviceId = [self.amplitude getDeviceId];
XCTAssertNil(initialDeviceId); // device id not initialized yet

[self.amplitude initializeApiKey:apiKey];
[self.amplitude flushQueueWithQueue:self.amplitude.initializerQueue];
[self.amplitude flushQueue];
NSString *generatedDeviceId = [self.amplitude getDeviceId];
XCTAssertNotNil(generatedDeviceId);
XCTAssertNotEqualObjects(initialDeviceId, generatedDeviceId);
#if !TARGET_OS_OSX
XCTAssertEqual(generatedDeviceId.length, 36);
#else
Expand Down
Loading