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

fix: initialize device info before generating the device ID #491

Merged
merged 4 commits into from
Apr 5, 2024
Merged

fix: initialize device info before generating the device ID #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3bb0b6e
fix: initialize device info before generating the device ID
bgiori Apr 4, 2024
bc7398e
Merge branch 'main' into fix-get-device-id
bgiori Apr 4, 2024
50c2e2f
fix merge conflict
bgiori Apr 4, 2024
0597f3d
fix: dont return string from initializeDeviceInfo
bgiori Apr 5, 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
11 changes: 6 additions & 5 deletions Sources/Amplitude/Amplitude.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,8 +524,7 @@ - (void)initializeApiKey:(NSString *)apiKey
self.apiKey = apiKey;

[self runOnBackgroundQueue:^{
self->_deviceInfo = [[AMPDeviceInfo alloc] init];
[self initializeDeviceId];
[self initializeDeviceInfo];
if (setUserId) {
[self setUserId:userId];
} else {
Expand Down Expand Up @@ -1670,7 +1669,7 @@ - (NSString *)getAdSupportID {

- (NSString *)getDeviceId {
if (self.deviceId == nil) {
return [self initializeDeviceId];
[self initializeDeviceInfo];
}
return self.deviceId;
}
Expand All @@ -1679,8 +1678,11 @@ - (long long)getSessionId {
return _sessionId;
}

- (NSString *)initializeDeviceId {
- (void)initializeDeviceInfo {
@synchronized (self) {
if (self->_deviceInfo == nil) {
self->_deviceInfo = [[AMPDeviceInfo alloc] init];
}
if (self.deviceId == nil) {
self.deviceId = [self.dbHelper getValue:DEVICE_ID];
if (![self isValidDeviceId:self.deviceId]) {
Expand All @@ -1689,7 +1691,6 @@ - (NSString *)initializeDeviceId {
}
}
}
return self.deviceId;
}

- (NSString *)_getDeviceId {
Expand Down
18 changes: 14 additions & 4 deletions Tests/AmplitudeTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1705,12 +1705,22 @@ - (void)testOpenURLFiresDeepLinkEvent {
XCTAssertEqualObjects([[event objectForKey:@"event_properties"] objectForKey:kAMPEventPropLinkUrl], @"https://test-app.com");
}

- (void)testGetDeviceIdAfterInit {
NSString *instanceName = @"testGetDeviceIdAfterInit";
- (void)testGetDeviceIdBeforeInit {
NSString *instanceName = @"testGetDeviceIdBeforeAndAfterInit";

// Clear device ID from db
AMPDatabaseHelper *dbHelper = [AMPDatabaseHelper getDatabaseHelper:instanceName];
[dbHelper insertOrReplaceKeyValue:@"device_id" value:nil];

// Device ID should get generated before api key init
Amplitude *client = [Amplitude instanceWithName:instanceName];
[client initializeApiKey:@"testGetDeviceIdAfterInit"];
NSString *deviceId = [client getDeviceId];
XCTAssertNotEqualObjects(deviceId, @"");
XCTAssertNotNil(deviceId);

// Device ID should match after init.
[client initializeApiKey:@"testGetDeviceIdBeforeAndAfterInit"];
NSString *deviceIdAfterInit = [client getDeviceId];
XCTAssertEqualObjects(deviceId, deviceIdAfterInit);
}

@end
Loading