For issue #9364 Crash when blocking app permissions and returning to

the app
mozilla-mobile · Mar 25, 2020 · eb5cdcd · eb5cdcd
1 parent f0bce01
commit eb5cdcd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsFragment.kt
@@ -18,17 +18,13 @@ import org.mozilla.fenix.settings.PhoneFeature
 @SuppressWarnings("TooManyFunctions")
 class SitePermissionsFragment : PreferenceFragmentCompat() {
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        showToolbar(getString(R.string.preferences_site_permissions))
-    }
-
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.site_permissions_preferences, rootKey)
     }
 
     override fun onResume() {
         super.onResume()
+        showToolbar(getString(R.string.preferences_site_permissions))
         setupPreferences()
     }
 

diff --git a/...a/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManagePhoneFeatureFragment.kt b/...a/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManagePhoneFeatureFragment.kt
@@ -57,8 +57,6 @@ class SitePermissionsManagePhoneFeatureFragment : Fragment() {
         phoneFeature = SitePermissionsManagePhoneFeatureFragmentArgs
             .fromBundle(requireArguments())
             .permission.toPhoneFeature()
-
-        showToolbar(phoneFeature.getLabel(requireContext()))
         settings = requireContext().settings()
     }
 
@@ -84,6 +82,7 @@ class SitePermissionsManagePhoneFeatureFragment : Fragment() {
 
     override fun onResume() {
         super.onResume()
+        showToolbar(phoneFeature.getLabel(requireContext()))
         initBlockedByAndroidView(phoneFeature, blockedByAndroidView)
     }