For #4807 - Always navigate to settings after deleting data

app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataFragment.kt

@@ -210,45 +210,9 @@ class DeleteBrowsingDataFragment : Fragment(R.layout.fragment_delete_browsing_da
         )
     }
 
-    // If coming from Open Tab -> Settings, pop back to Home
-    // If coming from Home -> Settings, pop back to Settings
     private fun returnToDeletionOrigin() {
-        // If Delete browsing data fragment isn't in the backstack
-        // then Android may have changed their naming convention
-        // and we want to prevent a crash by defaulting to pop home behavior
-        if (checkIfFragmentInBackStack(R.id.deleteBrowsingDataFragment)) {
-            // If Settings is in the backstack then we can continue with intended behavior
-            if (checkIfFragmentInBackStack(R.id.browserFragment)) findNavController().popBackStack(
-                R.id.homeFragment,
-                false
-            )
-            else findNavController().popBackStack()
-        } else {
-            findNavController().popBackStack(
-                R.id.homeFragment,
-                false
-            )
-        }
-    }
-
-    // For some reason, the only way you can tell if you came from
-    // BrowserFrag -> Settings OR BrowserFrag -> HomeFrag -> Settings is to check whether
-    // there is a browser fragment entry in the back stack. If there is, it means you came from BrowserFrag -> Settings
-    // if there isn't, it means you came from HomeFrag -> Settings
-    private fun checkIfFragmentInBackStack(res: Int): Boolean {
-        val backStackEntryCount = parentFragmentManager.backStackEntryCount
-        for (i in 0 until backStackEntryCount) {
-            if (getResIdFromBackstack(parentFragmentManager.getBackStackEntryAt(i).name) == res) {
-                return true
-            }
-        }
-
-        return false
-    }
-
-    private fun getResIdFromBackstack(name: String?): Int {
-        val idString = name?.split("-")
-        return idString!![1].toInt()
+        val directions = DeleteBrowsingDataFragmentDirections.actionDeleteBrowsingDataFragmentToSettingsFragment()
+        findNavController().navigate(directions)
     }
 
     companion object {

app/src/main/res/navigation/nav_graph.xml

@@ -525,7 +525,12 @@
     <fragment
         android:id="@+id/deleteBrowsingDataFragment"
         android:name="org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataFragment"
-        android:label="@string/preferences_delete_browsing_data" />
+        android:label="@string/preferences_delete_browsing_data" >
+        <action
+            android:id="@+id/action_deleteBrowsingDataFragment_to_settingsFragment"
+            app:destination="@id/settingsFragment"
+            app:popUpTo="@id/homeFragment" />
+    </fragment>
     <fragment
         android:id="@+id/exceptionsFragment"
         android:name="org.mozilla.fenix.exceptions.ExceptionsFragment"