Merge pull request #660 from vector-im/feature/permission

Ask for permission to write external storage when uri comes from the keyboard (#658)

CHANGES.md

@@ -14,6 +14,7 @@ Other changes:
 Bugfix 🐛:
  - Fix issues with some member events rendering (#498)
  - Passphrase does not match (Export room keys) (#644)
+ - Ask for permission to write external storage when uri comes from the keyboard (#658)
 
 Translations 🗣:
  -

vector/src/main/java/im/vector/riotx/core/utils/PermissionsTools.kt

@@ -67,6 +67,7 @@ const val PERMISSION_REQUEST_CODE_EXPORT_KEYS = 573
 const val PERMISSION_REQUEST_CODE_CHANGE_AVATAR = 574
 const val PERMISSION_REQUEST_CODE_DOWNLOAD_FILE = 575
 const val PERMISSION_REQUEST_CODE_PICK_ATTACHMENT = 576
+const val PERMISSION_REQUEST_CODE_INCOMING_URI = 577
 
 /**
  * Log the used permissions statuses.

vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt

@@ -81,8 +81,6 @@ import im.vector.riotx.core.platform.VectorBaseFragment
 import im.vector.riotx.core.ui.views.JumpToReadMarkerView
 import im.vector.riotx.core.ui.views.NotificationAreaView
 import im.vector.riotx.core.utils.*
-import im.vector.riotx.core.utils.Debouncer
-import im.vector.riotx.core.utils.createUIHandler
 import im.vector.riotx.features.attachments.AttachmentTypeSelectorView
 import im.vector.riotx.features.attachments.AttachmentsHelper
 import im.vector.riotx.features.attachments.ContactAttachment
@@ -619,18 +617,26 @@ class RoomDetailFragment :
         }
         composerLayout.callback = object : TextComposerView.Callback {
             override fun onRichContentSelected(contentUri: Uri): Boolean {
-                val shareIntent = Intent().apply {
+                // We need WRITE_EXTERNAL permission
-                    action = Intent.ACTION_SEND
+                return if (checkPermissions(PERMISSIONS_FOR_WRITING_FILES, this@RoomDetailFragment, PERMISSION_REQUEST_CODE_INCOMING_URI)) {
-                    data = contentUri
+                    sendUri(contentUri)
+                } else {
+                    roomDetailViewModel.pendingUri = contentUri
+                    // Always intercept when we request some permission
+                    true
                 }
+            }
+        }
+    }
+
+    private fun sendUri(uri: Uri): Boolean {
+        val shareIntent = Intent(Intent.ACTION_SEND, uri)
         val isHandled = attachmentsHelper.handleShareIntent(shareIntent)
         if (!isHandled) {
             Toast.makeText(requireContext(), R.string.error_handling_incoming_share, Toast.LENGTH_SHORT).show()
         }
         return isHandled
     }
-        }
-    }
 
     private fun setupAttachmentButton() {
         composerLayout.attachmentButton.setOnClickListener {
@@ -906,13 +912,22 @@ class RoomDetailFragment :
 
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
         if (allGranted(grantResults)) {
-            if (requestCode == PERMISSION_REQUEST_CODE_DOWNLOAD_FILE) {
+            when (requestCode) {
+                PERMISSION_REQUEST_CODE_DOWNLOAD_FILE   -> {
                     val action = roomDetailViewModel.pendingAction
                     if (action != null) {
                         roomDetailViewModel.pendingAction = null
                         roomDetailViewModel.process(action)
                     }
-            } else if (requestCode == PERMISSION_REQUEST_CODE_PICK_ATTACHMENT) {
+                }
+                PERMISSION_REQUEST_CODE_INCOMING_URI    -> {
+                    val pendingUri = roomDetailViewModel.pendingUri
+                    if (pendingUri != null) {
+                        roomDetailViewModel.pendingUri = null
+                        sendUri(pendingUri)
+                    }
+                }
+                PERMISSION_REQUEST_CODE_PICK_ATTACHMENT -> {
                     val pendingType = attachmentsHelper.pendingType
                     if (pendingType != null) {
                         attachmentsHelper.pendingType = null
@@ -920,6 +935,12 @@ class RoomDetailFragment :
                     }
                 }
             }
+        } else {
+            // Reset all pending data
+            roomDetailViewModel.pendingAction = null
+            roomDetailViewModel.pendingUri = null
+            attachmentsHelper.pendingType = null
+        }
     }
 
     override fun onAudioMessageClicked(messageAudioContent: MessageAudioContent) {

vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt

@@ -16,6 +16,7 @@
 
 package im.vector.riotx.features.home.room.detail
 
+import android.net.Uri
 import androidx.annotation.IdRes
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
@@ -95,6 +96,8 @@ class RoomDetailViewModel @AssistedInject constructor(@Assisted initialState: Ro
 
     // Slot to keep a pending action during permission request
     var pendingAction: RoomDetailActions? = null
+    // Slot to keep a pending uri during permission request
+    var pendingUri: Uri? = null
 
     @AssistedInject.Factory
     interface Factory {