From cd64647a4d9f49d31384ca101709429ebbbda87c Mon Sep 17 00:00:00 2001
From: Tiger Oakes <toakes@mozilla.com>
Date: Fri, 15 May 2020 14:55:12 -0700
Subject: [PATCH] For #9286 - Add isDefault to topsites

---
 .../mozilla/fenix/components/TopSiteStorage.kt   | 16 ++++++----------
 .../java/org/mozilla/fenix/utils/Settings.kt     |  2 +-
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/components/TopSiteStorage.kt b/app/src/main/java/org/mozilla/fenix/components/TopSiteStorage.kt
index f6d5ac3d1..08a9a375c 100644
--- a/app/src/main/java/org/mozilla/fenix/components/TopSiteStorage.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/TopSiteStorage.kt
@@ -9,7 +9,6 @@ import androidx.lifecycle.LiveData
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import mozilla.components.feature.top.sites.TopSite
 import mozilla.components.feature.top.sites.TopSiteStorage
 import mozilla.components.support.locale.LocaleManager
@@ -34,8 +33,8 @@ class TopSiteStorage(private val context: Context) {
     /**
      * Adds a new [TopSite].
      */
-    fun addTopSite(title: String, url: String) {
-        storage.addTopSite(title, url)
+    fun addTopSite(title: String, url: String, isDefault: Boolean = false) {
+        storage.addTopSite(title, url, isDefault)
     }
 
     /**
@@ -78,15 +77,12 @@ class TopSiteStorage(private val context: Context) {
                 )
             )
 
-            GlobalScope.launch(Dispatchers.Main) {
-                withContext(Dispatchers.IO) {
-                    topSiteCandidates.forEach {
-                        addTopSite(it.first, it.second)
-                    }
+            GlobalScope.launch(Dispatchers.IO) {
+                topSiteCandidates.forEach { (title, url) ->
+                    addTopSite(title, url, isDefault = true)
                 }
             }
-            context.settings().preferences.edit()
-                .putBoolean(context.getString(R.string.default_top_sites_added), true).apply()
+            context.settings().defaultTopSitesAdded = true
         }
     }
 }
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 d2558ec46..0e1744ce0 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@@ -439,7 +439,7 @@ class Settings private constructor(
         default = true
     )
 
-    val defaultTopSitesAdded by booleanPreference(
+    var defaultTopSitesAdded by booleanPreference(
         appContext.getPreferenceKey(R.string.default_top_sites_added),
         default = false
     )