blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Replace PhoneFeature.getPreferenceKey

master
Tiger Oakes 2020-06-15 11:28:27 -07:00 committed by Emily Kager
parent 596c579bbb
commit c503798cd6
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/org/mozilla/fenix/settings/PhoneFeature.kt
View File

@ -85,17 +85,27 @@ enum class PhoneFeature(val androidPermissionsList: Array<String>) : Parcelable
}
}
fun getPreferenceKey(context: Context): String {
/**
* Returns a resource ID from preference_keys representing the preference corresponding
* to this phone feature.
*/
@StringRes
fun getPreferenceId(): Int {
return when (this) {
CAMERA -> context.getPreferenceKey(R.string.pref_key_phone_feature_camera)
LOCATION -> context.getPreferenceKey(R.string.pref_key_phone_feature_location)
MICROPHONE -> context.getPreferenceKey(R.string.pref_key_phone_feature_microphone)
NOTIFICATION -> context.getPreferenceKey(R.string.pref_key_phone_feature_notification)
AUTOPLAY_AUDIBLE -> context.getPreferenceKey(R.string.pref_key_browser_feature_autoplay_audible)
AUTOPLAY_INAUDIBLE -> context.getPreferenceKey(R.string.pref_key_browser_feature_autoplay_inaudible)
CAMERA -> R.string.pref_key_phone_feature_camera
LOCATION -> R.string.pref_key_phone_feature_location
MICROPHONE -> R.string.pref_key_phone_feature_microphone
NOTIFICATION -> R.string.pref_key_phone_feature_notification
AUTOPLAY_AUDIBLE -> R.string.pref_key_browser_feature_autoplay_audible
AUTOPLAY_INAUDIBLE -> R.string.pref_key_browser_feature_autoplay_inaudible
}
}
/**
* Returns the key representing the preference corresponding to this phone feature.
*/
fun getPreferenceKey(context: Context): String = context.getPreferenceKey(getPreferenceId())
fun getAction(settings: Settings): SitePermissionsRules.Action =
settings.getSitePermissionsPhoneFeatureAction(this, getDefault())

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

@ -64,8 +64,7 @@ class SitePermissionsDetailsExceptionsFragment : PreferenceFragmentCompat() {
private fun initPhoneFeature(phoneFeature: PhoneFeature) {
val summary = phoneFeature.getActionLabel(requireContext(), sitePermissions)
val keyPreference = phoneFeature.getPreferenceKey(requireContext())
val cameraPhoneFeatures: Preference = requireNotNull(findPreference(keyPreference))
val cameraPhoneFeatures = requirePreference<Preference>(phoneFeature.getPreferenceId())
cameraPhoneFeatures.summary = summary
cameraPhoneFeatures.onPreferenceClickListener = Preference.OnPreferenceClickListener {

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

@ -14,6 +14,7 @@ import org.mozilla.fenix.ext.getPreferenceKey
import org.mozilla.fenix.ext.settings
import org.mozilla.fenix.ext.showToolbar
import org.mozilla.fenix.settings.PhoneFeature
import org.mozilla.fenix.settings.requirePreference
@SuppressWarnings("TooManyFunctions")
class SitePermissionsFragment : PreferenceFragmentCompat() {
@ -64,9 +65,8 @@ class SitePermissionsFragment : PreferenceFragmentCompat() {
} else {
null
}
val preferenceKey = phoneFeature.getPreferenceKey(context)
val cameraPhoneFeatures: Preference = requireNotNull(findPreference(preferenceKey))
val cameraPhoneFeatures = requirePreference<Preference>(phoneFeature.getPreferenceId())
cameraPhoneFeatures.summary = autoplaySummary ?: summary
cameraPhoneFeatures.onPreferenceClickListener = OnPreferenceClickListener {