For issue #9364 Crash when blocking app permissions and returning to
the app
This commit is contained in:
parent
eea6eb0c4c
commit
fa9dae0d72
|
@ -18,17 +18,13 @@ import org.mozilla.fenix.settings.PhoneFeature
|
||||||
@SuppressWarnings("TooManyFunctions")
|
@SuppressWarnings("TooManyFunctions")
|
||||||
class SitePermissionsFragment : PreferenceFragmentCompat() {
|
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?) {
|
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
|
||||||
setPreferencesFromResource(R.xml.site_permissions_preferences, rootKey)
|
setPreferencesFromResource(R.xml.site_permissions_preferences, rootKey)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onResume() {
|
override fun onResume() {
|
||||||
super.onResume()
|
super.onResume()
|
||||||
|
showToolbar(getString(R.string.preferences_site_permissions))
|
||||||
setupPreferences()
|
setupPreferences()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -57,8 +57,6 @@ class SitePermissionsManagePhoneFeatureFragment : Fragment() {
|
||||||
phoneFeature = SitePermissionsManagePhoneFeatureFragmentArgs
|
phoneFeature = SitePermissionsManagePhoneFeatureFragmentArgs
|
||||||
.fromBundle(requireArguments())
|
.fromBundle(requireArguments())
|
||||||
.permission.toPhoneFeature()
|
.permission.toPhoneFeature()
|
||||||
|
|
||||||
showToolbar(phoneFeature.getLabel(requireContext()))
|
|
||||||
settings = requireContext().settings()
|
settings = requireContext().settings()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -84,6 +82,7 @@ class SitePermissionsManagePhoneFeatureFragment : Fragment() {
|
||||||
|
|
||||||
override fun onResume() {
|
override fun onResume() {
|
||||||
super.onResume()
|
super.onResume()
|
||||||
|
showToolbar(phoneFeature.getLabel(requireContext()))
|
||||||
initBlockedByAndroidView(phoneFeature, blockedByAndroidView)
|
initBlockedByAndroidView(phoneFeature, blockedByAndroidView)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user