Fix logic so `isFirstRun` can be called multiple times on first run

3 years ago · ca069a78d2
parent c9c28b66c8
commit ca069a78d2
1 changed files with 11 additions and 17 deletions
--- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@ -352,23 +352,17 @@ class Settings(private val appContext: Context) : PreferencesHolder {
        default = false
    )

-    val isFirstRun: Boolean
-        get() {
-            val isFirstRun = preferences.getBoolean(
-                appContext.getPreferenceKey(R.string.pref_key_is_first_run),
-                true
-            )
-
-            if (isFirstRun) {
-                preferences.edit()
-                    .putBoolean(
-                        appContext.getPreferenceKey(R.string.pref_key_is_first_run),
-                        false
-                    )
-                    .apply()
-            }
-
-            return isFirstRun
+    val isFirstRun: Boolean =
+        if (!preferences.contains(appContext.getPreferenceKey(R.string.pref_key_is_first_run))) {
+            preferences.edit()
+                .putBoolean(
+                    appContext.getPreferenceKey(R.string.pref_key_is_first_run),
+                    false
+                )
+                .apply()
+            true
+        } else {
+            false
        }

    /**