blallo
/
fenix
1
0
Fork 0
Code Releases Activity

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

the app
master
Arturo Mejia 2020-03-24 16:19:56 -04:00 committed by Emily Kager
parent eea6eb0c4c
commit fa9dae0d72
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsFragment.kt
View File

@ -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()
}

3
app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManagePhoneFeatureFragment.kt
View File

@ -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)
}