filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

It work on on Android 10, to check on Android 5

Browse Source
This commit is contained in:
Benoit Marty 2020-09-18 09:43:17 +02:00 committed by Benoit Marty
parent fee7701d26
commit 5b1737ae46
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
View File

@ -30,8 +30,6 @@ import androidx.fragment.app.Fragment
import im.vector.app.R import im.vector.app.R
import timber.log.Timber import timber.log.Timber
private const val LOG_TAG = "PermissionUtils"
// Android M permission request code management // Android M permission request code management
private const val PERMISSIONS_GRANTED = true private const val PERMISSIONS_GRANTED = true
private const val PERMISSIONS_DENIED = !PERMISSIONS_GRANTED private const val PERMISSIONS_DENIED = !PERMISSIONS_GRANTED
@ -47,7 +45,7 @@ private const val PERMISSION_READ_EXTERNAL_STORAGE = 0x1 shl 4
// Permissions sets // Permissions sets
const val PERMISSIONS_FOR_AUDIO_IP_CALL = PERMISSION_RECORD_AUDIO 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_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_MEMBERS_SEARCH = PERMISSION_READ_CONTACTS
const val PERMISSIONS_FOR_MEMBER_DETAILS = PERMISSION_READ_CONTACTS const val PERMISSIONS_FOR_MEMBER_DETAILS = PERMISSION_READ_CONTACTS
const val PERMISSIONS_FOR_ROOM_AVATAR = PERMISSION_CAMERA const val PERMISSIONS_FOR_ROOM_AVATAR = PERMISSION_CAMERA

7
vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
View File

@ -41,7 +41,6 @@ import im.vector.app.R
import im.vector.app.core.extensions.getMeasurements import im.vector.app.core.extensions.getMeasurements
import im.vector.app.core.utils.PERMISSIONS_EMPTY 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_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.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
import im.vector.app.features.attachments.AttachmentTypeSelectorView.Callback import im.vector.app.features.attachments.AttachmentTypeSelectorView.Callback
import kotlin.math.max import kotlin.math.max
@ -215,10 +214,10 @@ class AttachmentTypeSelectorView(context: Context,
*/ */
enum class Type(val permissionsBit: Int) { enum class Type(val permissionsBit: Int) {
CAMERA(PERMISSIONS_FOR_TAKING_PHOTO), CAMERA(PERMISSIONS_FOR_TAKING_PHOTO),
GALLERY(PERMISSIONS_FOR_READING_FILES), GALLERY(PERMISSIONS_EMPTY),
FILE(PERMISSIONS_FOR_READING_FILES), FILE(PERMISSIONS_EMPTY),
STICKER(PERMISSIONS_EMPTY), STICKER(PERMISSIONS_EMPTY),
AUDIO(PERMISSIONS_FOR_READING_FILES), AUDIO(PERMISSIONS_EMPTY),
CONTACT(PERMISSIONS_FOR_PICKING_CONTACT) CONTACT(PERMISSIONS_FOR_PICKING_CONTACT)
} }
} }