From 367678cad4a66d4e205b84dc959a74bae90e81ef Mon Sep 17 00:00:00 2001
From: Charlie Humphreys <chumphreys@mozilla.com>
Date: Thu, 11 Aug 2022 15:48:44 -0500
Subject: [PATCH] [fenix] change name for isFirstRun to isFirstNimbusRun and
 move setter to after experiments are set

---
 .../main/java/org/mozilla/fenix/experiments/NimbusSetup.kt  | 6 +++---
 app/src/main/java/org/mozilla/fenix/utils/Settings.kt       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/experiments/NimbusSetup.kt b/app/src/main/java/org/mozilla/fenix/experiments/NimbusSetup.kt
index 14156c570..9471a67df 100644
--- a/app/src/main/java/org/mozilla/fenix/experiments/NimbusSetup.kt
+++ b/app/src/main/java/org/mozilla/fenix/experiments/NimbusSetup.kt
@@ -80,7 +80,7 @@ fun createNimbus(context: Context, url: String?): NimbusApi {
             // and would mostly produce the value `Beta` and rarely would produce `beta`.
             channel = BuildConfig.BUILD_TYPE,
             customTargetingAttributes = mapOf(
-                "isFirstRun" to context.settings().isFirstRun.toString()
+                "isFirstRun" to context.settings().isFirstNimbusRun.toString()
             )
         )
         Nimbus(context, appInfo, serverSettings, errorReporter).apply {
@@ -101,9 +101,9 @@ fun createNimbus(context: Context, url: String?): NimbusApi {
                 globalUserParticipation = enabled
             }
 
-            if (context.settings().isFirstRun || url.isNullOrBlank()) {
-                context.settings().isFirstRun = false
+            if (context.settings().isFirstNimbusRun || url.isNullOrBlank()) {
                 setExperimentsLocally(R.raw.initial_experiments)
+                context.settings().isFirstNimbusRun = false
             }
 
             // We may have downloaded experiments on a previous run, so let's start using them
diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
index a89e1712e..e2631cf1d 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@@ -347,7 +347,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
         default = false
     )
 
-    val isFirstRun: Boolean by booleanPreference(
+    var isFirstNimbusRun: Boolean by booleanPreference(
         appContext.getPreferenceKey(R.string.pref_key_is_first_run),
         default = true
     )