From 95208c84a98c02b6f91942cd06ed7ccced4543d9 Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Wed, 31 Jul 2019 14:43:15 -0400
Subject: [PATCH] Closes #4265 - Do not pop after all exceptions are removed
 (#4392)

---
 .../org/mozilla/fenix/exceptions/ExceptionsFragment.kt   | 9 +--------
 app/src/main/res/xml/preferences.xml                     | 2 +-
 app/src/main/res/xml/tracking_protection_preferences.xml | 2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/exceptions/ExceptionsFragment.kt b/app/src/main/java/org/mozilla/fenix/exceptions/ExceptionsFragment.kt
index 5d1e52875..5c78817be 100644
--- a/app/src/main/java/org/mozilla/fenix/exceptions/ExceptionsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/exceptions/ExceptionsFragment.kt
@@ -11,7 +11,6 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
-import androidx.navigation.Navigation
 import kotlinx.android.synthetic.main.fragment_exceptions.view.*
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.Dispatchers.Main
@@ -65,9 +64,7 @@ class ExceptionsFragment : Fragment() {
         viewLifecycleOwner.lifecycleScope.launch(IO) {
             val domains = ExceptionDomains.load(context!!)
             ExceptionDomains.remove(context!!, domains)
-            launch(Main) {
-                view?.let { view -> Navigation.findNavController(view).navigateUp() }
-            }
+            reloadData()
         }
     }
 
@@ -101,10 +98,6 @@ class ExceptionsFragment : Fragment() {
 
         coroutineScope {
             launch(Main) {
-                if (items.isEmpty()) {
-                    view?.let { view: View -> Navigation.findNavController(view).navigateUp() }
-                    return@launch
-                }
                 exceptionsStore.dispatch(ExceptionsAction.Change(items))
             }
         }
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 334a4c231..59cff6e3c 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -55,7 +55,7 @@
         android:title="@string/preferences_category_privacy"
         app:iconSpaceReserved="false">
         <androidx.preference.Preference
-            android:icon="@drawable/ic_tracking_protection"
+            android:icon="@drawable/ic_tracking_protection_enabled"
             android:key="@string/pref_key_tracking_protection_settings"
             android:title="@string/preferences_tracking_protection" />
         <androidx.preference.Preference
diff --git a/app/src/main/res/xml/tracking_protection_preferences.xml b/app/src/main/res/xml/tracking_protection_preferences.xml
index 2ec3f5fcd..267045457 100644
--- a/app/src/main/res/xml/tracking_protection_preferences.xml
+++ b/app/src/main/res/xml/tracking_protection_preferences.xml
@@ -5,7 +5,7 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <SwitchPreference
         android:defaultValue="true"
-        android:icon="@drawable/ic_tracking_protection"
+        android:icon="@drawable/ic_tracking_protection_enabled"
         android:key="@string/pref_key_tracking_protection"
         android:summary="@string/preferences_tracking_protection_description"
         android:title="@string/preferences_tracking_protection" />