From ca851a38be735fc4e84cbc59399c0e08bef3f5fa Mon Sep 17 00:00:00 2001 From: Arturo Mejia Date: Tue, 22 Jun 2021 16:25:06 -0400 Subject: [PATCH] [fenix] For https://github.com/mozilla-mobile/fenix/issues/19922 Fix the default autoplay setting to be block audio only --- .../java/org/mozilla/fenix/settings/PhoneFeature.kt | 6 +++--- app/src/main/java/org/mozilla/fenix/utils/Settings.kt | 4 ++-- app/src/main/res/values/preference_keys.xml | 6 +++--- ...ite_permissions_details_exceptions_preferences.xml | 2 +- app/src/main/res/xml/site_permissions_preferences.xml | 2 +- .../org/mozilla/fenix/settings/PhoneFeatureTest.kt | 11 +++-------- .../test/java/org/mozilla/fenix/utils/SettingsTest.kt | 8 ++++---- 7 files changed, 17 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/settings/PhoneFeature.kt b/app/src/main/java/org/mozilla/fenix/settings/PhoneFeature.kt index 12aae14f8..d3724a374 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/PhoneFeature.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/PhoneFeature.kt @@ -99,9 +99,9 @@ enum class PhoneFeature(val androidPermissionsList: Array) : Parcelable 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 -> R.string.pref_key_browser_feature_autoplay_audible_v1 - AUTOPLAY_AUDIBLE -> R.string.pref_key_browser_feature_autoplay_audible_v1 - AUTOPLAY_INAUDIBLE -> R.string.pref_key_browser_feature_autoplay_inaudible_v1 + AUTOPLAY -> R.string.pref_key_browser_feature_autoplay_v2 + AUTOPLAY_AUDIBLE -> R.string.pref_key_browser_feature_autoplay_audible_v2 + AUTOPLAY_INAUDIBLE -> R.string.pref_key_browser_feature_autoplay_inaudible_v2 PERSISTENT_STORAGE -> R.string.pref_key_browser_feature_persistent_storage MEDIA_KEY_SYSTEM_ACCESS -> R.string.pref_key_browser_feature_media_key_system_access } diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt index 06d08a340..fd87cea44 100644 --- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt +++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt @@ -837,11 +837,11 @@ class Settings(private val appContext: Context) : PreferencesHolder { camera = getSitePermissionsPhoneFeatureAction(PhoneFeature.CAMERA), autoplayAudible = getSitePermissionsPhoneFeatureAutoplayAction( feature = PhoneFeature.AUTOPLAY_AUDIBLE, - default = AutoplayAction.ALLOWED + default = AutoplayAction.BLOCKED ), autoplayInaudible = getSitePermissionsPhoneFeatureAutoplayAction( feature = PhoneFeature.AUTOPLAY_INAUDIBLE, - default = AutoplayAction.BLOCKED + default = AutoplayAction.ALLOWED ), persistentStorage = getSitePermissionsPhoneFeatureAction(PhoneFeature.PERSISTENT_STORAGE), mediaKeySystemAccess = getSitePermissionsPhoneFeatureAction(PhoneFeature.MEDIA_KEY_SYSTEM_ACCESS) diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml index ec7d48987..1ad043092 100644 --- a/app/src/main/res/values/preference_keys.xml +++ b/app/src/main/res/values/preference_keys.xml @@ -115,9 +115,9 @@ pref_key_show_site_exceptions pref_key_recommended_settings pref_key_custom_settings - pref_key_browser_feature_autoplay_v1 - pref_key_browser_feature_autoplay_v1 - pref_key_browser_feature_autoplay_inaudible_v1 + pref_key_browser_feature_autoplay_v2 + pref_key_browser_feature_autoplay_v2 + pref_key_browser_feature_autoplay_inaudible_v2 pref_key_browser_feature_persistent_storage pref_key_browser_feature_media_key_system_access pref_key_phone_feature_camera diff --git a/app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml b/app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml index 59e97e554..69b25a706 100644 --- a/app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml +++ b/app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml @@ -42,7 +42,7 @@ diff --git a/app/src/main/res/xml/site_permissions_preferences.xml b/app/src/main/res/xml/site_permissions_preferences.xml index 1d3be1f15..fa965a579 100644 --- a/app/src/main/res/xml/site_permissions_preferences.xml +++ b/app/src/main/res/xml/site_permissions_preferences.xml @@ -7,7 +7,7 @@ diff --git a/app/src/test/java/org/mozilla/fenix/settings/PhoneFeatureTest.kt b/app/src/test/java/org/mozilla/fenix/settings/PhoneFeatureTest.kt index fe2071e77..a84b21641 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/PhoneFeatureTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/PhoneFeatureTest.kt @@ -74,14 +74,9 @@ class PhoneFeatureTest { assertEquals(R.string.pref_key_phone_feature_location, PhoneFeature.LOCATION.getPreferenceId()) assertEquals(R.string.pref_key_phone_feature_microphone, PhoneFeature.MICROPHONE.getPreferenceId()) assertEquals(R.string.pref_key_phone_feature_notification, PhoneFeature.NOTIFICATION.getPreferenceId()) - assertEquals(R.string.pref_key_browser_feature_autoplay_audible_v1, PhoneFeature.AUTOPLAY_AUDIBLE.getPreferenceId()) - assertEquals(R.string.pref_key_browser_feature_autoplay_inaudible_v1, PhoneFeature.AUTOPLAY_INAUDIBLE.getPreferenceId()) - assertEquals(R.string.pref_key_browser_feature_autoplay_audible_v1, PhoneFeature.AUTOPLAY.getPreferenceId()) - - assertEquals( - "pref_key_browser_feature_autoplay_inaudible_v1", - PhoneFeature.AUTOPLAY_INAUDIBLE.getPreferenceKey(testContext) - ) + assertEquals(R.string.pref_key_browser_feature_autoplay_audible_v2, PhoneFeature.AUTOPLAY_AUDIBLE.getPreferenceId()) + assertEquals(R.string.pref_key_browser_feature_autoplay_inaudible_v2, PhoneFeature.AUTOPLAY_INAUDIBLE.getPreferenceId()) + assertEquals(R.string.pref_key_browser_feature_autoplay_v2, PhoneFeature.AUTOPLAY.getPreferenceId()) } @Test diff --git a/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt b/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt index 6609d0dd5..83aaaba85 100644 --- a/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt +++ b/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt @@ -33,8 +33,8 @@ class SettingsTest { location = ASK_TO_ALLOW, microphone = ASK_TO_ALLOW, notification = ASK_TO_ALLOW, - autoplayAudible = AutoplayAction.ALLOWED, - autoplayInaudible = AutoplayAction.BLOCKED, + autoplayAudible = AutoplayAction.BLOCKED, + autoplayInaudible = AutoplayAction.ALLOWED, persistentStorage = ASK_TO_ALLOW, mediaKeySystemAccess = ASK_TO_ALLOW ) @@ -601,12 +601,12 @@ class SettingsTest { val settings = Settings(testContext) assertEquals( - AutoplayAction.ALLOWED, + AutoplayAction.BLOCKED, settings.getSitePermissionsCustomSettingsRules().autoplayAudible ) assertEquals( - AutoplayAction.BLOCKED, + AutoplayAction.ALLOWED, settings.getSitePermissionsCustomSettingsRules().autoplayInaudible ) }