From bf44c50dfde1240917ba907ca4abf79af53ccb8a Mon Sep 17 00:00:00 2001
From: Mugurell <petrumugurel@gmail.com>
Date: Tue, 30 Jul 2019 16:02:50 +0300
Subject: [PATCH] Fix #4372 - Set SitePermissionsDetailsExceptionsFragment
 toolbar title in onResume

The flow we are currently using involves setting a new title for the containing
Activity when the user navigates to a new Fragment.
This happened for SitePermissionsDetailsExceptionsFragment in it's onCreate().
Opening a permission (SitePermissionsManageExceptionsPhoneFeatureFragment) will
set a new title in it's onCreate() but going back from this new Fragment will
not create again a new SitePermissionsDetailsExceptionsFragment.
As a workaround I moved the call to set Activity's title in onResume().
---
 .../settings/SitePermissionsDetailsExceptionsFragment.kt   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/settings/SitePermissionsDetailsExceptionsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SitePermissionsDetailsExceptionsFragment.kt
index a1e7da49f..569b92c21 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SitePermissionsDetailsExceptionsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SitePermissionsDetailsExceptionsFragment.kt
@@ -30,13 +30,10 @@ class SitePermissionsDetailsExceptionsFragment : PreferenceFragmentCompat() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        (activity as AppCompatActivity).supportActionBar?.show()
 
         sitePermissions = SitePermissionsDetailsExceptionsFragmentArgs
             .fromBundle(requireArguments())
             .sitePermissions
-
-        (activity as AppCompatActivity).title = sitePermissions.origin
     }
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
@@ -45,6 +42,10 @@ class SitePermissionsDetailsExceptionsFragment : PreferenceFragmentCompat() {
 
     override fun onResume() {
         super.onResume()
+        (activity as AppCompatActivity).apply {
+            title = sitePermissions.origin
+            supportActionBar?.show()
+        }
         lifecycleScope.launch(IO) {
             val context = requireContext()
             sitePermissions =