safely exposed autoplay rules to external apps

mozilla-mobile · Feb 20, 2020 · b0a4c8c · b0a4c8c
1 parent 9cd7f01
commit b0a4c8c
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 7 deletions.
diff --git a/...missions/src/main/java/mozilla/components/feature/sitepermissions/SitePermissionsRules.kt b/...missions/src/main/java/mozilla/components/feature/sitepermissions/SitePermissionsRules.kt
@@ -12,14 +12,31 @@ import mozilla.components.feature.sitepermissions.SitePermissionsRules.Action.BL
 /**
  * Indicate how site permissions must behave by permission category.
  */
-data class SitePermissionsRules(
+data class SitePermissionsRules internal constructor(
     val camera: Action,
     val location: Action,
     val notification: Action,
     val microphone: Action,
     val autoplayAudible: Action,
     val autoplayInaudible: Action
 ) {
+
+    constructor(
+        camera: Action,
+        location: Action,
+        notification: Action,
+        microphone: Action,
+        autoplayAudible: AutoplayAction,
+        autoplayInaudible: AutoplayAction
+    ) : this(
+        camera = camera,
+        location = location,
+        notification = notification,
+        microphone = microphone,
+        autoplayAudible = autoplayAudible.toAction(),
+        autoplayInaudible = autoplayInaudible.toAction()
+    )
+
     enum class Action {
         ALLOWED, BLOCKED, ASK_TO_ALLOW;
 
@@ -30,6 +47,18 @@ data class SitePermissionsRules(
         }
     }
 
+    /**
+     * Autoplay requests will never prompt the user
+     */
+    enum class AutoplayAction {
+        ALLOWED, BLOCKED;
+
+        fun toAction(): Action = when (this) {
+            ALLOWED -> Action.ALLOWED
+            BLOCKED -> Action.BLOCKED
+        }
+    }
+
     internal fun getActionFrom(request: PermissionRequest): Action {
         return if (request.containsVideoAndAudioSources()) {
             getActionForCombinedPermission()

diff --git a/samples/browser/src/main/java/org/mozilla/samples/browser/BaseBrowserFragment.kt b/samples/browser/src/main/java/org/mozilla/samples/browser/BaseBrowserFragment.kt
@@ -162,12 +162,15 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler {
                 context = requireContext(),
                 sessionManager = components.sessionManager,
                 sessionId = sessionId,
-                fragmentManager = requireFragmentManager()
-//                , TODO
-//                sitePermissionsRules = SitePermissionsRules(
-//                    autoplayAudible =
-//                    autoplayInaudible =
-//                )
+                fragmentManager = requireFragmentManager(),
+                sitePermissionsRules = SitePermissionsRules(
+                    autoplayAudible = SitePermissionsRules.AutoplayAction.ALLOWED,
+                    autoplayInaudible = SitePermissionsRules.AutoplayAction.ALLOWED,
+                    camera = SitePermissionsRules.Action.ASK_TO_ALLOW,
+                    location = SitePermissionsRules.Action.ASK_TO_ALLOW,
+                    notification = SitePermissionsRules.Action.ASK_TO_ALLOW,
+                    microphone = SitePermissionsRules.Action.ASK_TO_ALLOW
+                )
             ) { permissions ->
                 requestPermissions(permissions, REQUEST_CODE_APP_PERMISSIONS)
             },