From 0a74773cee240cb3eca7e0318ac32c28335519c7 Mon Sep 17 00:00:00 2001
From: Sawyer Blatz <sdblatz@gmail.com>
Date: Thu, 3 Oct 2019 10:58:46 -0700
Subject: [PATCH] Fixes comments

---
 app/src/main/java/org/mozilla/fenix/HomeActivity.kt | 13 ++++++-------
 .../org/mozilla/fenix/IntentReceiverActivity.kt     |  2 ++
 ...ragment.kt => DefaultBrowserSettingsFragment.kt} |  4 ++--
 app/src/main/res/navigation/nav_graph.xml           |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)
 rename app/src/main/java/org/mozilla/fenix/settings/{DefaultBrowserFragment.kt => DefaultBrowserSettingsFragment.kt} (96%)

diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index 693d32e429bd..98d6bfd9769b 100644
--- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -130,13 +130,12 @@ open class HomeActivity : AppCompatActivity() {
         // We do this on a separate thread to alleviate performance issues
         val weakReferenceContext = WeakReference(this)
         lifecycleScope.launch {
-            weakReferenceContext.get()?.let {
-                if (!Browsers.all(it).isDefaultBrowser) {
-                    it.settings().preferences
-                        .edit()
-                        .putBoolean(it.getString(R.string.pref_key_open_links_in_a_private_tab), false)
-                        .apply()
-                }
+            val context = weakReferenceContext.get() ?: return@launch
+            if (!Browsers.all(context).isDefaultBrowser) {
+                context.settings().preferences
+                    .edit()
+                    .putBoolean(context.getString(R.string.pref_key_open_links_in_a_private_tab), false)
+                    .apply()
             }
         }
     }
diff --git a/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt b/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt
index 3baf1eb46e88..776c27bf873b 100644
--- a/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt
@@ -122,7 +122,9 @@ class IntentReceiverActivity : Activity() {
     }
 
     companion object {
+        // This constant must match the metadata from the private activity-alias
         const val LAUNCH_PRIVATE_LINK = "org.mozilla.fenix.LAUNCH_PRIVATE_LINK"
+
         const val ACTION_OPEN_TAB = "org.mozilla.fenix.OPEN_TAB"
         const val ACTION_OPEN_PRIVATE_TAB = "org.mozilla.fenix.OPEN_PRIVATE_TAB"
     }
diff --git a/app/src/main/java/org/mozilla/fenix/settings/DefaultBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/DefaultBrowserSettingsFragment.kt
similarity index 96%
rename from app/src/main/java/org/mozilla/fenix/settings/DefaultBrowserFragment.kt
rename to app/src/main/java/org/mozilla/fenix/settings/DefaultBrowserSettingsFragment.kt
index 322d92870e79..66f3ef7591da 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/DefaultBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/DefaultBrowserSettingsFragment.kt
@@ -22,9 +22,9 @@ import org.mozilla.fenix.ext.getPreferenceKey
 import org.mozilla.fenix.ext.settings
 
 /**
- * Lets the user toggle telemetry on/off.
+ * Lets the user control their default browser preferences
  */
-class DefaultBrowserFragment : PreferenceFragmentCompat() {
+class DefaultBrowserSettingsFragment : PreferenceFragmentCompat() {
 
     private val preferenceChangeListener =
         SharedPreferences.OnSharedPreferenceChangeListener { sharedPreferences, key ->
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index e35934c91b07..2783aca2379e 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -590,6 +590,6 @@
         android:label="AddNewDeviceFragment" />
     <fragment
         android:id="@+id/defaultBrowserFragment"
-        android:name="org.mozilla.fenix.settings.DefaultBrowserFragment"
+        android:name="org.mozilla.fenix.settings.DefaultBrowserSettingsFragment"
         android:label="DefaultBrowserFragment" />
 </navigation>