From 5b1737ae4669165eedb49e749188f99015c60fde Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 18 Sep 2020 09:43:17 +0200 Subject: [PATCH] It work on on Android 10, to check on Android 5 --- .../main/java/im/vector/app/core/utils/PermissionsTools.kt | 4 +--- .../app/features/attachments/AttachmentTypeSelectorView.kt | 7 +++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt b/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt index 3bf1194d11..52f90dd9e8 100644 --- a/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt +++ b/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt @@ -30,8 +30,6 @@ import androidx.fragment.app.Fragment import im.vector.app.R import timber.log.Timber -private const val LOG_TAG = "PermissionUtils" - // Android M permission request code management private const val PERMISSIONS_GRANTED = true private const val PERMISSIONS_DENIED = !PERMISSIONS_GRANTED @@ -47,7 +45,7 @@ private const val PERMISSION_READ_EXTERNAL_STORAGE = 0x1 shl 4 // Permissions sets const val PERMISSIONS_FOR_AUDIO_IP_CALL = PERMISSION_RECORD_AUDIO const val PERMISSIONS_FOR_VIDEO_IP_CALL = PERMISSION_CAMERA or PERMISSION_RECORD_AUDIO -const val PERMISSIONS_FOR_TAKING_PHOTO = PERMISSION_CAMERA or PERMISSION_READ_EXTERNAL_STORAGE +const val PERMISSIONS_FOR_TAKING_PHOTO = PERMISSION_CAMERA const val PERMISSIONS_FOR_MEMBERS_SEARCH = PERMISSION_READ_CONTACTS const val PERMISSIONS_FOR_MEMBER_DETAILS = PERMISSION_READ_CONTACTS const val PERMISSIONS_FOR_ROOM_AVATAR = PERMISSION_CAMERA diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt index dda92e271b..b9ccad9455 100644 --- a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt +++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt @@ -41,7 +41,6 @@ import im.vector.app.R import im.vector.app.core.extensions.getMeasurements import im.vector.app.core.utils.PERMISSIONS_EMPTY import im.vector.app.core.utils.PERMISSIONS_FOR_PICKING_CONTACT -import im.vector.app.core.utils.PERMISSIONS_FOR_READING_FILES import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO import im.vector.app.features.attachments.AttachmentTypeSelectorView.Callback import kotlin.math.max @@ -215,10 +214,10 @@ class AttachmentTypeSelectorView(context: Context, */ enum class Type(val permissionsBit: Int) { CAMERA(PERMISSIONS_FOR_TAKING_PHOTO), - GALLERY(PERMISSIONS_FOR_READING_FILES), - FILE(PERMISSIONS_FOR_READING_FILES), + GALLERY(PERMISSIONS_EMPTY), + FILE(PERMISSIONS_EMPTY), STICKER(PERMISSIONS_EMPTY), - AUDIO(PERMISSIONS_FOR_READING_FILES), + AUDIO(PERMISSIONS_EMPTY), CONTACT(PERMISSIONS_FOR_PICKING_CONTACT) } }