Download file - WIP

2019-07-08 19:06:17 +02:00
parent 12bd85e0a9
commit a07f8b615e
14 changed files with 193 additions and 62 deletions
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailActions.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailActions.kt
@ -18,6 +18,7 @@ package im.vector.riotx.features.home.room.detail

 import com.jaiselrahman.filepicker.model.MediaFile
 import im.vector.matrix.android.api.session.room.model.EditAggregatedSummary
+import im.vector.matrix.android.api.session.room.model.message.MessageFileContent
 import im.vector.matrix.android.api.session.room.timeline.Timeline
 import im.vector.matrix.android.api.session.room.timeline.TimelineEvent

@ -33,6 +34,7 @@ sealed class RoomDetailActions {
    data class UpdateQuickReactAction(val targetEventId: String, val selectedReaction: String, val add: Boolean) : RoomDetailActions()
    data class ShowEditHistoryAction(val event: String, val editAggregatedSummary: EditAggregatedSummary) : RoomDetailActions()
    data class NavigateToEvent(val eventId: String, val position: Int?) : RoomDetailActions()
+    data class DownloadFile(val eventId: String, val messageFileContent: MessageFileContent) : RoomDetailActions()
    object AcceptInvite : RoomDetailActions()
    object RejectInvite : RoomDetailActions()

--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
@ -63,19 +63,14 @@ import im.vector.riotx.R
 import im.vector.riotx.core.di.ScreenComponent
 import im.vector.riotx.core.dialogs.DialogListItem
 import im.vector.riotx.core.epoxy.LayoutManagerStateRestorer
+import im.vector.riotx.core.error.ErrorFormatter
 import im.vector.riotx.core.extensions.hideKeyboard
 import im.vector.riotx.core.extensions.observeEvent
 import im.vector.riotx.core.extensions.setTextOrHide
+import im.vector.riotx.core.files.addEntryToDownloadManager
 import im.vector.riotx.core.glide.GlideApp
 import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
-import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA
-import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_NATIVE_CAMERA
-import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_NATIVE_VIDEO_CAMERA
-import im.vector.riotx.core.utils.checkPermissions
-import im.vector.riotx.core.utils.copyToClipboard
-import im.vector.riotx.core.utils.openCamera
-import im.vector.riotx.core.utils.shareMedia
+import im.vector.riotx.core.utils.*
 import im.vector.riotx.features.autocomplete.command.AutocompleteCommandPresenter
 import im.vector.riotx.features.autocomplete.command.CommandAutocompletePolicy
 import im.vector.riotx.features.autocomplete.user.AutocompleteUserPresenter
@ -180,6 +175,7 @@ class RoomDetailFragment :
    @Inject lateinit var notificationDrawerManager: NotificationDrawerManager
    @Inject lateinit var roomDetailViewModelFactory: RoomDetailViewModel.Factory
    @Inject lateinit var textComposerViewModelFactory: TextComposerViewModel.Factory
+    @Inject lateinit var errorFormatter: ErrorFormatter
    private lateinit var scrollOnNewMessageCallback: ScrollOnNewMessageCallback
    private lateinit var scrollOnHighlightedEventCallback: ScrollOnHighlightedEventCallback

@ -220,6 +216,15 @@ class RoomDetailFragment :
            scrollOnHighlightedEventCallback.scheduleScrollTo(it)
        }

+        roomDetailViewModel.downloadedFileEvent.observeEvent(this) { downloadFileState ->
+            if (downloadFileState.throwable != null) {
+                requireActivity().toast(errorFormatter.toHumanReadable(downloadFileState.throwable))
+            } else if (downloadFileState.file != null) {
+                requireActivity().toast(getString(R.string.downloaded_file, downloadFileState.file.path))
+                addEntryToDownloadManager(requireContext(), downloadFileState.file, downloadFileState.mimeType)
+            }
+        }
+
        roomDetailViewModel.selectSubscribe(
                RoomDetailViewState::sendMode,
                RoomDetailViewState::selectedEvent,
@ -615,8 +620,8 @@ class RoomDetailFragment :
        startActivity(intent)
    }

-    override fun onFileMessageClicked(messageFileContent: MessageFileContent) {
-        vectorBaseActivity.notImplemented("open file")
+    override fun onFileMessageClicked(eventId: String, messageFileContent: MessageFileContent) {
+        roomDetailViewModel.process(RoomDetailActions.DownloadFile(eventId, messageFileContent))
    }

    override fun onAudioMessageClicked(messageAudioContent: MessageAudioContent) {
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
+++ b/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.content.ClipDescription
 import android.net.Uri
 import android.text.TextUtils
 import androidx.lifecycle.LiveData
@ -31,10 +32,12 @@ import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.content.ContentAttachmentData
 import im.vector.matrix.android.api.session.events.model.toModel
+import im.vector.matrix.android.api.session.file.FileService
 import im.vector.matrix.android.api.session.room.model.Membership
 import im.vector.matrix.android.api.session.room.model.message.MessageContent
 import im.vector.matrix.android.api.session.room.model.message.MessageType
 import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
+import im.vector.matrix.android.internal.crypto.attachments.toElementToDecrypt
 import im.vector.matrix.rx.rx
 import im.vector.riotx.R
 import im.vector.riotx.core.intent.getFilenameFromUri
@ -50,6 +53,7 @@ import io.reactivex.rxkotlin.subscribeBy
 import org.commonmark.parser.Parser
 import org.commonmark.renderer.html.HtmlRenderer
 import timber.log.Timber
+import java.io.File
 import java.text.SimpleDateFormat
 import java.util.*
 import java.util.concurrent.TimeUnit
@ -113,6 +117,7 @@ class RoomDetailViewModel @AssistedInject constructor(@Assisted initialState: Ro
            is RoomDetailActions.EnterEditMode          -> handleEditAction(action)
            is RoomDetailActions.EnterQuoteMode         -> handleQuoteAction(action)
            is RoomDetailActions.EnterReplyMode         -> handleReplyAction(action)
+            is RoomDetailActions.DownloadFile           -> handleDownloadFile(action)
            is RoomDetailActions.NavigateToEvent        -> handleNavigateToEvent(action)
            else                                        -> Timber.e("Unhandled Action: $action")
        }
@ -149,6 +154,10 @@ class RoomDetailViewModel @AssistedInject constructor(@Assisted initialState: Ro
    val navigateToEvent: LiveData<LiveEvent<String>>
        get() = _navigateToEvent

+    private val _downloadedFileEvent = MutableLiveData<LiveEvent<DownloadFileState>>()
+    val downloadedFileEvent: LiveData<LiveEvent<DownloadFileState>>
+        get() = _downloadedFileEvent
+

    // PRIVATE METHODS *****************************************************************************

@ -433,6 +442,46 @@ class RoomDetailViewModel @AssistedInject constructor(@Assisted initialState: Ro
        }
    }

+    data class DownloadFileState(
+            val mimeType: String,
+            val file: File?,
+            val throwable: Throwable?
+    )
+
+    private fun handleDownloadFile(action: RoomDetailActions.DownloadFile) {
+        session.downloadFile(
+                FileService.DownloadMode.TO_EXPORT,
+                action.eventId,
+                action.messageFileContent.filename ?: "file.dat",
+                action.messageFileContent.url,
+                action.messageFileContent.encryptedFileInfo?.toElementToDecrypt(),
+                object : MatrixCallback<File> {
+                    override fun onSuccess(data: File) {
+                        _downloadedFileEvent.postValue(LiveEvent(DownloadFileState(
+                                // Mimetype default to plain text, should not be used
+                                action.messageFileContent.encryptedFileInfo?.mimetype
+                                        ?: action.messageFileContent.info?.mimeType
+                                        ?: ClipDescription.MIMETYPE_TEXT_PLAIN,
+                                data,
+                                null
+                        )))
+                    }
+
+                    override fun onFailure(failure: Throwable) {
+                        _downloadedFileEvent.postValue(LiveEvent(DownloadFileState(
+                                // Mimetype default to plain text, should not be used
+                                action.messageFileContent.encryptedFileInfo?.mimetype
+                                        ?: action.messageFileContent.info?.mimeType
+                                        ?: ClipDescription.MIMETYPE_TEXT_PLAIN,
+                                null,
+                                failure
+                        )))
+                    }
+                })
+
+    }
+
+
    private fun handleNavigateToEvent(action: RoomDetailActions.NavigateToEvent) {
        val targetEventId = action.eventId

--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/TimelineEventController.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/TimelineEventController.kt
@ -57,7 +57,7 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Tim
        fun onEncryptedMessageClicked(informationData: MessageInformationData, view: View)
        fun onImageMessageClicked(messageImageContent: MessageImageContent, mediaData: ImageContentRenderer.Data, view: View)
        fun onVideoMessageClicked(messageVideoContent: MessageVideoContent, mediaData: VideoContentRenderer.Data, view: View)
-        fun onFileMessageClicked(messageFileContent: MessageFileContent)
+        fun onFileMessageClicked(eventId: String, messageFileContent: MessageFileContent)
        fun onAudioMessageClicked(messageAudioContent: MessageAudioContent)
        fun onEditedDecorationClicked(informationData: MessageInformationData, editAggregatedSummary: EditAggregatedSummary?)
    }
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MessageItemFactory.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MessageItemFactory.kt
@ -162,7 +162,7 @@ class MessageItemFactory @Inject constructor(
                }
                .clickListener(
                        DebouncedClickListener(View.OnClickListener { _ ->
-                            callback?.onFileMessageClicked(messageContent)
+                            callback?.onFileMessageClicked(informationData.eventId, messageContent)
                        }))
    }

--- a/vector/src/main/java/im/vector/riotx/features/media/VideoContentRenderer.kt
+++ b/vector/src/main/java/im/vector/riotx/features/media/VideoContentRenderer.kt
@ -23,6 +23,7 @@ import android.widget.TextView
 import android.widget.VideoView
 import androidx.core.view.isVisible
 import im.vector.matrix.android.api.MatrixCallback
+import im.vector.matrix.android.api.session.file.FileService
 import im.vector.matrix.android.internal.crypto.attachments.ElementToDecrypt
 import im.vector.riotx.R
 import im.vector.riotx.core.di.ActiveSessionHolder
@ -64,7 +65,9 @@ class VideoContentRenderer @Inject constructor(private val activeSessionHolder:
                loadingView.isVisible = true

                activeSessionHolder.getActiveSession()
-                        .decryptFile(data.eventId,
+                        .downloadFile(
+                                FileService.DownloadMode.FOR_INTERNAL_USE,
+                                data.eventId,
                                data.filename,
                                data.url,
                                data.elementToDecrypt,
--- a/vector/src/main/res/values/strings_riotX.xml
+++ b/vector/src/main/res/values/strings_riotX.xml
@ -11,5 +11,8 @@
    <string name="send_file_step_encrypting_file">Encrypting file…</string>
    <string name="send_file_step_sending_file">Sending file (%1$s / %2$s)</string>

+    <string name="downloading_file">Downloading file %1$s…</string>
+    <string name="downloaded_file">File %1$s has been downloaded!</string>
+

 </resources>