Skip to content
This repository has been archived by the owner on Feb 20, 2023. It is now read-only.

Commit

Permalink
Merge branch 'Amejia481-manage_site_permissions_exceptions'
Browse files Browse the repository at this point in the history
  • Loading branch information
colintheshots committed Apr 15, 2019
2 parents 068744e + 574ee5e commit cf5ecc2
Show file tree
Hide file tree
Showing 24 changed files with 915 additions and 179 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -33,6 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- #1603 - Remove deprecated success path for Firefox Accounts login
- #619 - Sets toolbar behavior based on accessibility and if session is loading
- #1571 - Added a snackbar for undoing bookmark deletion
- #1079 - Managing site permissions exceptions

### Changed
- #1429 - Updated site permissions ui for MVP
Expand Down
13 changes: 13 additions & 0 deletions app/src/main/java/org/mozilla/fenix/components/Storage.kt
Expand Up @@ -5,6 +5,7 @@
package org.mozilla.fenix.components

import android.content.Context
import androidx.paging.DataSource
import mozilla.components.feature.sitepermissions.SitePermissions
import mozilla.components.feature.sitepermissions.SitePermissions.Status
import mozilla.components.feature.sitepermissions.SitePermissionsStorage
Expand Down Expand Up @@ -41,4 +42,16 @@ class Storage(private val context: Context) {
fun updateSitePermissions(sitePermissions: SitePermissions) {
permissionsStorage.update(sitePermissions)
}

fun getSitePermissionsPaged(): DataSource.Factory<Int, SitePermissions> {
return permissionsStorage.getSitePermissionsPaged()
}

fun deleteSitePermissions(sitePermissions: SitePermissions) {
permissionsStorage.remove(sitePermissions)
}

fun deleteAllSitePermissions() {
permissionsStorage.removeAll()
}
}
37 changes: 37 additions & 0 deletions app/src/main/java/org/mozilla/fenix/settings/Extensions.kt
Expand Up @@ -5,6 +5,9 @@
package org.mozilla.fenix.settings

import android.content.Context
import android.view.View
import android.widget.TextView
import androidx.core.text.HtmlCompat
import mozilla.components.feature.sitepermissions.SitePermissions
import mozilla.components.feature.sitepermissions.SitePermissionsRules
import org.mozilla.fenix.R
Expand Down Expand Up @@ -73,3 +76,37 @@ fun SitePermissions.toggle(featurePhone: PhoneFeature): SitePermissions {
}
}
}

fun PhoneFeature.getLabel(context: Context): String {
return when (this) {
PhoneFeature.CAMERA -> context.getString(R.string.preference_phone_feature_camera)
PhoneFeature.LOCATION -> context.getString(R.string.preference_phone_feature_location)
PhoneFeature.MICROPHONE -> context.getString(R.string.preference_phone_feature_microphone)
PhoneFeature.NOTIFICATION -> context.getString(R.string.preference_phone_feature_notification)
}
}

fun PhoneFeature.getPreferenceKey(context: Context): String {
return when (this) {
PhoneFeature.CAMERA -> context.getString(R.string.pref_key_phone_feature_camera)
PhoneFeature.LOCATION -> context.getString(R.string.pref_key_phone_feature_location)
PhoneFeature.MICROPHONE -> context.getString(R.string.pref_key_phone_feature_microphone)
PhoneFeature.NOTIFICATION -> context.getString(R.string.pref_key_phone_feature_notification)
}
}

fun initBlockedByAndroidView(phoneFeature: PhoneFeature, blockedByAndroidView: View) {
val context = blockedByAndroidView.context
if (!phoneFeature.isAndroidPermissionGranted(context)) {
blockedByAndroidView.visibility = View.VISIBLE

val descriptionLabel = blockedByAndroidView.findViewById<TextView>(R.id.blocked_by_android_explanation_label)
val text = context.getString(
R.string.phone_feature_blocked_by_android_explanation,
phoneFeature.getLabel(context)
)
descriptionLabel.text = HtmlCompat.fromHtml(text, HtmlCompat.FROM_HTML_MODE_COMPACT)
} else {
blockedByAndroidView.visibility = View.GONE
}
}
62 changes: 32 additions & 30 deletions app/src/main/java/org/mozilla/fenix/settings/PhoneFeature.kt
Expand Up @@ -4,7 +4,6 @@

package org.mozilla.fenix.settings

import android.Manifest
import android.Manifest.permission.ACCESS_COARSE_LOCATION
import android.Manifest.permission.ACCESS_FINE_LOCATION
import android.Manifest.permission.RECORD_AUDIO
Expand All @@ -13,16 +12,17 @@ import mozilla.components.feature.sitepermissions.SitePermissions
import mozilla.components.support.ktx.android.content.isPermissionGranted
import org.mozilla.fenix.utils.Settings

const val ID_CAMERA_PERMISSION = 0
const val ID_LOCATION_PERMISSION = 1
const val ID_MICROPHONE_PERMISSION = 2
const val ID_NOTIFICATION_PERMISSION = 3
private const val CAMERA_PERMISSION = android.Manifest.permission.CAMERA

enum class PhoneFeature(val id: Int, val androidPermissionsList: Array<String>) {
CAMERA(SitePermissionsManagePhoneFeature.CAMERA_PERMISSION, arrayOf(Manifest.permission.CAMERA)),
LOCATION(
SitePermissionsManagePhoneFeature.LOCATION_PERMISSION, arrayOf(
ACCESS_COARSE_LOCATION,
ACCESS_FINE_LOCATION
)
),
MICROPHONE(SitePermissionsManagePhoneFeature.MICROPHONE_PERMISSION, arrayOf(RECORD_AUDIO)),
NOTIFICATION(SitePermissionsManagePhoneFeature.NOTIFICATION_PERMISSION, emptyArray());
CAMERA(ID_CAMERA_PERMISSION, arrayOf(CAMERA_PERMISSION)),
LOCATION(ID_LOCATION_PERMISSION, arrayOf(ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION)),
MICROPHONE(ID_MICROPHONE_PERMISSION, arrayOf(RECORD_AUDIO)),
NOTIFICATION(ID_NOTIFICATION_PERMISSION, emptyArray());

@Suppress("SpreadOperator")
fun isAndroidPermissionGranted(context: Context): Boolean {
Expand All @@ -33,54 +33,56 @@ enum class PhoneFeature(val id: Int, val androidPermissionsList: Array<String>)
return context.isPermissionGranted(*permissions)
}

fun getActionLabel(context: Context, sitePermissions: SitePermissions? = null, settings: Settings): String {
return when (this) {
fun getActionLabel(context: Context, sitePermissions: SitePermissions? = null, settings: Settings? = null): String {
val label = when (this) {
CAMERA -> {
sitePermissions?.camera?.toString(context) ?: settings
.getSitePermissionsPhoneFeatureCameraAction()
.toString(context)
?.getSitePermissionsPhoneFeatureCameraAction()
?.toString(context)
}
LOCATION -> {
sitePermissions?.location?.toString(context) ?: settings
.getSitePermissionsPhoneFeatureLocation()
.toString(context)
?.getSitePermissionsPhoneFeatureLocation()
?.toString(context)
}
MICROPHONE -> {
sitePermissions?.microphone?.toString(context) ?: settings
.getSitePermissionsPhoneFeatureMicrophoneAction()
.toString(context)
?.getSitePermissionsPhoneFeatureMicrophoneAction()
?.toString(context)
}
NOTIFICATION -> {
sitePermissions?.notification?.toString(context) ?: settings
.getSitePermissionsPhoneFeatureNotificationAction()
.toString(context)
?.getSitePermissionsPhoneFeatureNotificationAction()
?.toString(context)
}
}
return requireNotNull(label)
}

fun getStatus(sitePermissions: SitePermissions? = null, settings: Settings): SitePermissions.Status {
return when (this) {
fun getStatus(sitePermissions: SitePermissions? = null, settings: Settings? = null): SitePermissions.Status {
val status = when (this) {
CAMERA -> {
sitePermissions?.camera ?: settings
.getSitePermissionsPhoneFeatureCameraAction()
.toStatus()
?.getSitePermissionsPhoneFeatureCameraAction()
?.toStatus()
}
LOCATION -> {
sitePermissions?.location ?: settings
.getSitePermissionsPhoneFeatureLocation()
.toStatus()
?.getSitePermissionsPhoneFeatureLocation()
?.toStatus()
}
MICROPHONE -> {
sitePermissions?.microphone ?: settings
.getSitePermissionsPhoneFeatureMicrophoneAction()
.toStatus()
?.getSitePermissionsPhoneFeatureMicrophoneAction()
?.toStatus()
}
NOTIFICATION -> {
sitePermissions?.notification ?: settings
.getSitePermissionsPhoneFeatureNotificationAction()
.toStatus()
?.getSitePermissionsPhoneFeatureNotificationAction()
?.toStatus()
}
}
return requireNotNull(status)
}

companion object {
Expand Down
@@ -0,0 +1,130 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

package org.mozilla.fenix.settings

import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.navigation.Navigation
import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Dispatchers.IO
import kotlinx.coroutines.Dispatchers.Main
import kotlinx.coroutines.Job
import kotlinx.coroutines.launch
import mozilla.components.feature.sitepermissions.SitePermissions
import org.jetbrains.anko.alert
import org.jetbrains.anko.noButton
import org.jetbrains.anko.yesButton
import org.mozilla.fenix.R
import org.mozilla.fenix.ext.components
import org.mozilla.fenix.settings.PhoneFeature.CAMERA
import org.mozilla.fenix.settings.PhoneFeature.MICROPHONE
import org.mozilla.fenix.settings.PhoneFeature.LOCATION
import org.mozilla.fenix.settings.PhoneFeature.NOTIFICATION
import kotlin.coroutines.CoroutineContext

@SuppressWarnings("TooManyFunctions")
class SitePermissionsDetailsExceptionsFragment : PreferenceFragmentCompat(), CoroutineScope {
private lateinit var job: Job
override val coroutineContext: CoroutineContext get() = Dispatchers.IO + job
private lateinit var sitePermissions: SitePermissions

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
(activity as AppCompatActivity).supportActionBar?.show()

sitePermissions = SitePermissionsDetailsExceptionsFragmentArgs
.fromBundle(requireArguments())
.sitePermissions

(activity as AppCompatActivity).title = sitePermissions.origin
job = Job()
}

override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
setPreferencesFromResource(R.xml.site_permissions_details_exceptions_preferences, rootKey)
}

override fun onResume() {
super.onResume()
launch(IO) {
val context = requireContext()
sitePermissions = requireNotNull(context.components.storage.findSitePermissionsBy(sitePermissions.origin))
launch(Main) {
bindCategoryPhoneFeatures()
}
}
}

override fun onDestroy() {
super.onDestroy()
job.cancel()
}

private fun bindCategoryPhoneFeatures() {
val context = requireContext()

val cameraAction = CAMERA.getActionLabel(context, sitePermissions)
val locationAction = LOCATION.getActionLabel(context, sitePermissions)
val microphoneAction = MICROPHONE.getActionLabel(context, sitePermissions)
val notificationAction = NOTIFICATION.getActionLabel(context, sitePermissions)

initPhoneFeature(CAMERA, cameraAction)
initPhoneFeature(LOCATION, locationAction)
initPhoneFeature(MICROPHONE, microphoneAction)
initPhoneFeature(NOTIFICATION, notificationAction)
bindClearPermissionsButton()
}

private fun initPhoneFeature(phoneFeature: PhoneFeature, summary: String) {
val keyPreference = phoneFeature.getPreferenceKey(requireContext())
val cameraPhoneFeatures: Preference = requireNotNull(findPreference(keyPreference))
cameraPhoneFeatures.summary = summary

cameraPhoneFeatures.onPreferenceClickListener = Preference.OnPreferenceClickListener {
navigateToPhoneFeature(phoneFeature)
true
}
}

private fun bindClearPermissionsButton() {
val keyPreference = getString(R.string.pref_key_exceptions_clear_site_permissions)
val button: Preference = requireNotNull(findPreference(keyPreference))

button.onPreferenceClickListener = Preference.OnPreferenceClickListener {
requireContext().alert(
R.string.confirm_clear_permissions_site,
R.string.clear_permissions
) {
yesButton {
clearSitePermissions()
}
noButton { }
}.show()

true
}
}

private fun clearSitePermissions() {
launch(IO) {
requireContext().components.storage.deleteSitePermissions(sitePermissions)
launch(Main) {
Navigation.findNavController(requireNotNull(view)).popBackStack()
}
}
}

private fun navigateToPhoneFeature(phoneFeature: PhoneFeature) {
val directions =
SitePermissionsDetailsExceptionsFragmentDirections.actionSitePermissionsToExceptionsToManagePhoneFeature(
phoneFeatureId = phoneFeature.id,
sitePermissions = sitePermissions
)
Navigation.findNavController(view!!).navigate(directions)
}
}

0 comments on commit cf5ecc2

Please sign in to comment.