Matthew Finkel pushed to branch tor-browser-85.1.0-10.5-1 at The Tor Project / Applications / fenix
Commits:
-
9951b3da
by Matthew Finkel at 2021-01-27T23:19:21+00:00
-
dd2dbe8e
by Matthew Finkel at 2021-02-03T00:05:46+00:00
4 changed files:
- app/src/main/AndroidManifest.xml
- app/src/main/java/org/mozilla/fenix/settings/PhoneFeature.kt
- app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsFragment.kt
- app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManagePhoneFeatureFragment.kt
Changes:
| ... | ... | @@ -4,11 +4,8 @@ |
| 4 | 4 |
package="org.mozilla.fenix">
|
| 5 | 5 |
|
| 6 | 6 |
<uses-permission android:name="android.permission.INTERNET" />
|
| 7 |
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
|
| 8 | 7 |
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
|
| 9 | 8 |
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
| 10 |
- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
|
|
| 11 |
- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
|
|
| 12 | 9 |
<uses-permission android:name="android.permission.CAMERA" />
|
| 13 | 10 |
<uses-permission android:name="android.permission.RECORD_AUDIO" />
|
| 14 | 11 |
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
|
| ... | ... | @@ -49,7 +49,7 @@ enum class PhoneFeature(val androidPermissionsList: Array<String>) : Parcelable |
| 49 | 49 |
AUTOPLAY_AUDIBLE ->
|
| 50 | 50 |
when (settings?.getAutoplayUserSetting(default = AUTOPLAY_BLOCK_ALL) ?: AUTOPLAY_BLOCK_ALL) {
|
| 51 | 51 |
AUTOPLAY_ALLOW_ALL -> R.string.preference_option_autoplay_allowed2
|
| 52 |
- AUTOPLAY_ALLOW_ON_WIFI -> R.string.preference_option_autoplay_allowed_wifi_only2
|
|
| 52 |
+ // AUTOPLAY_ALLOW_ON_WIFI -> R.string.preference_option_autoplay_allowed_wifi_only2
|
|
| 53 | 53 |
AUTOPLAY_BLOCK_AUDIBLE -> R.string.preference_option_autoplay_block_audio2
|
| 54 | 54 |
AUTOPLAY_BLOCK_ALL -> R.string.preference_option_autoplay_blocked3
|
| 55 | 55 |
else -> R.string.preference_option_autoplay_blocked3
|
| ... | ... | @@ -116,6 +116,7 @@ enum class PhoneFeature(val androidPermissionsList: Array<String>) : Parcelable |
| 116 | 116 |
return when (this) {
|
| 117 | 117 |
AUTOPLAY_AUDIBLE -> SitePermissionsRules.Action.BLOCKED
|
| 118 | 118 |
AUTOPLAY_INAUDIBLE -> SitePermissionsRules.Action.ALLOWED
|
| 119 |
+ LOCATION -> SitePermissionsRules.Action.BLOCKED
|
|
| 119 | 120 |
else -> SitePermissionsRules.Action.ASK_TO_ALLOW
|
| 120 | 121 |
}
|
| 121 | 122 |
}
|
| ... | ... | @@ -52,6 +52,7 @@ class SitePermissionsFragment : PreferenceFragmentCompat() { |
| 52 | 52 |
// Autoplay inaudible should be set in the same menu as autoplay audible, so it does
|
| 53 | 53 |
// not need to be bound
|
| 54 | 54 |
.filter { it != PhoneFeature.AUTOPLAY_INAUDIBLE }
|
| 55 |
+ .filter { it != PhoneFeature.LOCATION }
|
|
| 55 | 56 |
.forEach(::initPhoneFeature)
|
| 56 | 57 |
}
|
| 57 | 58 |
|
| ... | ... | @@ -115,6 +115,7 @@ class SitePermissionsManagePhoneFeatureFragment : Fragment() { |
| 115 | 115 |
saveActionInSettings(AUTOPLAY_ALLOW_ALL)
|
| 116 | 116 |
}
|
| 117 | 117 |
restoreState(AUTOPLAY_ALLOW_ON_WIFI)
|
| 118 |
+ visibility = View.GONE
|
|
| 118 | 119 |
} else {
|
| 119 | 120 |
text = getString(R.string.preference_option_phone_feature_blocked)
|
| 120 | 121 |
setOnClickListener {
|