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: assign deviceId correctly on new device #492

Merged
merged 3 commits into from
Apr 5, 2024
Merged

fix: assign deviceId correctly on new device #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5bbc458
chore: remove podfile validateion from test action
bgiori Apr 5, 2024
cdb622c
chore: only run test on push to main, not every push
bgiori Apr 5, 2024
4a8978c
fix: assign self.deviceId correctly
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
9 changes: 5 additions & 4 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Test

on: [push, pull_request]
on:
pull_request:
push:
branches:
- main

jobs:
test:
Expand Down Expand Up @@ -32,9 +36,6 @@ jobs:
bundle install
pod install

- name: Validate Podfile
run: pod lib lint

- name: iOS Tests
run: |
xcodebuild test \
Expand Down
2 changes: 1 addition & 1 deletion Sources/Amplitude/Amplitude.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1686,7 +1686,7 @@ - (void)initializeDeviceInfo {
if (self.deviceId == nil) {
self.deviceId = [self.dbHelper getValue:DEVICE_ID];
if (![self isValidDeviceId:self.deviceId]) {
self.deviceId = [self _getDeviceId];
self->_deviceId = [self _getDeviceId];
bgiori marked this conversation as resolved.
Show resolved Hide resolved
[self.dbHelper insertOrReplaceKeyValue:DEVICE_ID value:self.deviceId];
}
}
Expand Down
4 changes: 2 additions & 2 deletions Tests/AmplitudeTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1708,9 +1708,9 @@ - (void)testOpenURLFiresDeepLinkEvent {
- (void)testGetDeviceIdBeforeInit {
NSString *instanceName = @"testGetDeviceIdBeforeAndAfterInit";

// Clear device ID from db
// Delete DB before running the test to start fresh
AMPDatabaseHelper *dbHelper = [AMPDatabaseHelper getDatabaseHelper:instanceName];
[dbHelper insertOrReplaceKeyValue:@"device_id" value:nil];
[dbHelper deleteDB];

// Device ID should get generated before api key init
Amplitude *client = [Amplitude instanceWithName:instanceName];
Expand Down
Loading