Closes #3013: Reset the legacy-id whenever collectionEnabled is on

mozilla-mobile · Jul 14, 2020 · 61e8e9e · 61e8e9e
1 parent 1979b12
commit 61e8e9e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/app/src/main/java/org/mozilla/tv/firefox/FirefoxApplication.kt b/app/src/main/java/org/mozilla/tv/firefox/FirefoxApplication.kt
@@ -110,15 +110,17 @@ open class FirefoxApplication : LocaleAwareApplication() {
                 // sending startup data, or 2) sending even when the user has toggled
                 // off data collection
                 Glean.setUploadEnabled(collectionEnabled)
+                if (collectionEnabled) {
+                    LegacyIds.clientId.set(UUID.fromString(TelemetryIntegration.INSTANCE.clientId))
+                }
             }
         }
     }
 
     private fun initGlean() {
         setGleanUpload()
+        LegacyIds.clientId.set(UUID.fromString(TelemetryIntegration.INSTANCE.clientId))
         Glean.initialize(applicationContext, Configuration(channel = BuildConfig.BUILD_TYPE))
-        val legacyId = TelemetryIntegration.INSTANCE.clientId
-        LegacyIds.clientId.set(UUID.fromString(legacyId))
     }
 
     // ServiceLocator needs to be created in onCreate in order to accept Application