fix: assign deviceId correctly on new device (#492)

amplitude · Apr 5, 2024 · a200db0 · a200db0
1 parent 7960a7e
commit a200db0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,6 +1,10 @@
 name: Test
 
-on: [push, pull_request]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
 
 jobs:
   test:
@@ -32,9 +36,6 @@ jobs:
           bundle install
           pod install
 
-      - name: Validate Podfile
-        run: pod lib lint
-
       - name: iOS Tests
         run: |
           xcodebuild test \

diff --git a/Sources/Amplitude/Amplitude.m b/Sources/Amplitude/Amplitude.m
@@ -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];
                 [self.dbHelper insertOrReplaceKeyValue:DEVICE_ID value:self.deviceId];
             }
         }

diff --git a/Tests/AmplitudeTests.m b/Tests/AmplitudeTests.m
@@ -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];