Commit a40c749b authored by Tiger Oakes's avatar Tiger Oakes
Browse files

Uplift permission functions fron Fenix

parent d1121b5c

components/concept/engine/src/main/java/mozilla/components/concept/engine/permission/PermissionRequest.kt

+21 −19
Original line number Diff line number Diff line
@@ -57,28 +57,30 @@ interface PermissionRequest { 
 * @property id an optional native engine-specific ID of this permission.

 * @property desc an optional description of what this permission type is for.

 */

sealed class Permission {

    abstract val id: String?

    abstract val desc: String?



sealed class Permission(open val id: String? = "", open val desc: String? = "") {

    data class ContentAudioCapture(override val id: String? = "", override val desc: String? = "") : Permission(id)

    data class ContentAudioMicrophone(override val id: String? = "", override val desc: String? = "") : Permission(id)

    data class ContentAudioOther(override val id: String? = "", override val desc: String? = "") : Permission(id)

    data class ContentGeoLocation(override val id: String? = "", override val desc: String? = "") : Permission(id)

    data class ContentNotification(override val id: String? = "", override val desc: String? = "") : Permission(id)

    data class ContentProtectedMediaId(override val id: String? = "", override val desc: String? = "") : Permission(id)

    data class ContentVideoCamera(override val id: String? = "", override val desc: String? = "") : Permission(id)

    data class ContentVideoCapture(override val id: String? = "", override val desc: String? = "") : Permission(id)

    data class ContentVideoScreen(override val id: String? = "", override val desc: String? = "") : Permission(id)

    data class ContentVideoOther(override val id: String? = "", override val desc: String? = "") : Permission(id)

    data class ContentAudioCapture(override val id: String? = "", override val desc: String? = "") : Permission()

    data class ContentAudioMicrophone(override val id: String? = "", override val desc: String? = "") : Permission()

    data class ContentAudioOther(override val id: String? = "", override val desc: String? = "") : Permission()

    data class ContentGeoLocation(override val id: String? = "", override val desc: String? = "") : Permission()

    data class ContentNotification(override val id: String? = "", override val desc: String? = "") : Permission()

    data class ContentProtectedMediaId(override val id: String? = "", override val desc: String? = "") : Permission()

    data class ContentVideoCamera(override val id: String? = "", override val desc: String? = "") : Permission()

    data class ContentVideoCapture(override val id: String? = "", override val desc: String? = "") : Permission()

    data class ContentVideoScreen(override val id: String? = "", override val desc: String? = "") : Permission()

    data class ContentVideoOther(override val id: String? = "", override val desc: String? = "") : Permission()



    data class AppCamera(override val id: String? = "", override val desc: String? = "") : Permission(id)

    data class AppAudio(override val id: String? = "", override val desc: String? = "") : Permission(id)

    data class AppLocationCoarse(override val id: String? = "", override val desc: String? = "") : Permission(id)

    data class AppLocationFine(override val id: String? = "", override val desc: String? = "") : Permission(id)

    data class AppCamera(override val id: String? = "", override val desc: String? = "") : Permission()

    data class AppAudio(override val id: String? = "", override val desc: String? = "") : Permission()

    data class AppLocationCoarse(override val id: String? = "", override val desc: String? = "") : Permission()

    data class AppLocationFine(override val id: String? = "", override val desc: String? = "") : Permission()



    data class Generic(override val id: String?, override val desc: String? = "") : Permission(id)

    data class Generic(override val id: String?, override val desc: String? = "") : Permission()



    // Removed in GeckoView 68.0:

    data class ContentVideoApplication(override val id: String? = "", override val desc: String? = "") : Permission(id)

    data class ContentVideoBrowser(override val id: String? = "", override val desc: String? = "") : Permission(id)

    data class ContentVideoWindow(override val id: String? = "", override val desc: String? = "") : Permission(id)

    data class ContentVideoApplication(override val id: String? = "", override val desc: String? = "") : Permission()

    data class ContentVideoBrowser(override val id: String? = "", override val desc: String? = "") : Permission()

    data class ContentVideoWindow(override val id: String? = "", override val desc: String? = "") : Permission()

}

components/feature/sitepermissions/src/main/java/mozilla/components/feature/sitepermissions/SitePermissions.kt

+5 −0
Original line number Diff line number Diff line
@@ -43,6 +43,11 @@ data class SitePermissions( 
        fun isAllowed() = this == ALLOWED



        fun doNotAskAgain() = this == ALLOWED || this == BLOCKED



        fun toggle(): Status = when (this) {

            BLOCKED, NO_DECISION -> ALLOWED

            ALLOWED -> BLOCKED

        }

    }



    override fun writeToParcel(parcel: Parcel, flags: Int) {

components/feature/sitepermissions/src/main/java/mozilla/components/feature/sitepermissions/SitePermissionsRules.kt

+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,11 @@ data class SitePermissionsRules( 
) {

    enum class Action {

        BLOCKED, ASK_TO_ALLOW;



        fun toStatus(): SitePermissions.Status = when (this) {

            BLOCKED -> SitePermissions.Status.BLOCKED

            ASK_TO_ALLOW -> SitePermissions.Status.NO_DECISION

        }

    }



    internal fun getActionFrom(request: PermissionRequest): Action {