6543
/
BayernMessenger
forked from GitHub-Mirror/riotX-android
1
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

Send file: cleanup

This commit is contained in:
Benoit Marty 2019-07-08 14:46:14 +02:00
parent 8a5612be3d
commit ea77686746
3 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/content/ContentUploadStateTracker.kt
View File

@ -29,9 +29,9 @@ interface ContentUploadStateTracker {
sealed class State { sealed class State {
object Idle : State() object Idle : State()
object EncryptingThumbnail : State() object EncryptingThumbnail : State()
data class ProgressThumbnailData(val current: Long, val total: Long) : State() data class UploadingThumbnail(val current: Long, val total: Long) : State()
object Encrypting : State() object Encrypting : State()
data class ProgressData(val current: Long, val total: Long) : State() data class Uploading(val current: Long, val total: Long) : State()
object Success : State() object Success : State()
data class Failure(val throwable: Throwable) : State() data class Failure(val throwable: Throwable) : State()
} }

4
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/DefaultContentUploadStateTracker.kt
View File

@ -59,7 +59,7 @@ internal class DefaultContentUploadStateTracker @Inject constructor() : ContentU
} }


internal fun setProgressThumbnail(key: String, current: Long, total: Long) { internal fun setProgressThumbnail(key: String, current: Long, total: Long) {
val progressData = ContentUploadStateTracker.State.ProgressThumbnailData(current, total) val progressData = ContentUploadStateTracker.State.UploadingThumbnail(current, total)
updateState(key, progressData) updateState(key, progressData)
} }


@ -69,7 +69,7 @@ internal class DefaultContentUploadStateTracker @Inject constructor() : ContentU
} }


internal fun setProgress(key: String, current: Long, total: Long) { internal fun setProgress(key: String, current: Long, total: Long) {
val progressData = ContentUploadStateTracker.State.ProgressData(current, total) val progressData = ContentUploadStateTracker.State.Uploading(current, total)
updateState(key, progressData) updateState(key, progressData)
} }



53
vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
View File

@ -26,7 +26,6 @@ import im.vector.matrix.android.api.session.content.ContentUploadStateTracker
import im.vector.riotx.R import im.vector.riotx.R
import im.vector.riotx.core.di.ActiveSessionHolder import im.vector.riotx.core.di.ActiveSessionHolder
import im.vector.riotx.features.media.ImageContentRenderer import im.vector.riotx.features.media.ImageContentRenderer
import java.io.File
import javax.inject.Inject import javax.inject.Inject


class ContentUploadStateTrackerBinder @Inject constructor(private val activeSessionHolder: ActiveSessionHolder) { class ContentUploadStateTrackerBinder @Inject constructor(private val activeSessionHolder: ActiveSessionHolder) {
@ -61,48 +60,43 @@ private class ContentMediaProgressUpdater(private val progressLayout: ViewGroup,


override fun onUpdate(state: ContentUploadStateTracker.State) { override fun onUpdate(state: ContentUploadStateTracker.State) {
when (state) { when (state) {
is ContentUploadStateTracker.State.Idle -> handleIdle(state) is ContentUploadStateTracker.State.Idle -> handleIdle(state)
is ContentUploadStateTracker.State.EncryptingThumbnail -> handleEncryptingThumbnail(state) is ContentUploadStateTracker.State.EncryptingThumbnail -> handleEncryptingThumbnail(state)
is ContentUploadStateTracker.State.ProgressThumbnailData -> handleProgressThumbnail(state) is ContentUploadStateTracker.State.UploadingThumbnail -> handleProgressThumbnail(state)
is ContentUploadStateTracker.State.Encrypting -> handleEncrypting(state) is ContentUploadStateTracker.State.Encrypting -> handleEncrypting(state)
is ContentUploadStateTracker.State.ProgressData -> handleProgress(state) is ContentUploadStateTracker.State.Uploading -> handleProgress(state)
is ContentUploadStateTracker.State.Failure -> handleFailure(state) is ContentUploadStateTracker.State.Failure -> handleFailure(state)
is ContentUploadStateTracker.State.Success -> handleSuccess(state) is ContentUploadStateTracker.State.Success -> handleSuccess(state)
} }
} }


private fun handleIdle(state: ContentUploadStateTracker.State.Idle) { private fun handleIdle(state: ContentUploadStateTracker.State.Idle) {
if (mediaData.isLocalFile()) { progressLayout.visibility = View.VISIBLE
val file = File(mediaData.url) val progressBar = progressLayout.findViewById<ProgressBar>(R.id.mediaProgressBar)
progressLayout.visibility = View.VISIBLE val progressTextView = progressLayout.findViewById<TextView>(R.id.mediaProgressTextView)
val progressBar = progressLayout.findViewById<ProgressBar>(R.id.mediaProgressBar) progressBar?.isVisible = true
val progressTextView = progressLayout.findViewById<TextView>(R.id.mediaProgressTextView) progressBar?.isIndeterminate = true
progressBar?.isVisible = true progressBar?.progress = 0
progressBar?.isIndeterminate = true progressTextView?.text = progressLayout.context.getString(R.string.send_file_step_idle)
progressBar?.progress = 0
progressTextView?.text = progressLayout.context.getString(R.string.send_file_step_idle)
} else {
progressLayout.visibility = View.GONE
}
} }


private fun handleEncryptingThumbnail(state: ContentUploadStateTracker.State.EncryptingThumbnail) { private fun handleEncryptingThumbnail(state: ContentUploadStateTracker.State.EncryptingThumbnail) {
_handleEncrypting(R.string.send_file_step_encrypting_thumbnail) doHandleEncrypting(R.string.send_file_step_encrypting_thumbnail)
} }


private fun handleProgressThumbnail(state: ContentUploadStateTracker.State.ProgressThumbnailData) { private fun handleProgressThumbnail(state: ContentUploadStateTracker.State.UploadingThumbnail) {
_handleProgress(R.string.send_file_step_sending_thumbnail, state.current, state.total) doHandleProgress(R.string.send_file_step_sending_thumbnail, state.current, state.total)
} }


private fun handleEncrypting(state: ContentUploadStateTracker.State.Encrypting) { private fun handleEncrypting(state: ContentUploadStateTracker.State.Encrypting) {
_handleEncrypting(R.string.send_file_step_encrypting_file) doHandleEncrypting(R.string.send_file_step_encrypting_file)
} }


private fun handleProgress(state: ContentUploadStateTracker.State.ProgressData) { private fun handleProgress(state: ContentUploadStateTracker.State.Uploading) {
_handleProgress(R.string.send_file_step_sending_file, state.current, state.total) doHandleProgress(R.string.send_file_step_sending_file, state.current, state.total)
} }


private fun _handleEncrypting(resId: Int) { private fun doHandleEncrypting(resId: Int) {
progressLayout.visibility = View.VISIBLE progressLayout.visibility = View.VISIBLE
val progressBar = progressLayout.findViewById<ProgressBar>(R.id.mediaProgressBar) val progressBar = progressLayout.findViewById<ProgressBar>(R.id.mediaProgressBar)
val progressTextView = progressLayout.findViewById<TextView>(R.id.mediaProgressTextView) val progressTextView = progressLayout.findViewById<TextView>(R.id.mediaProgressTextView)
@ -110,7 +104,7 @@ private class ContentMediaProgressUpdater(private val progressLayout: ViewGroup,
progressTextView?.text = progressLayout.context.getString(resId) progressTextView?.text = progressLayout.context.getString(resId)
} }


private fun _handleProgress(resId: Int, current: Long, total: Long) { private fun doHandleProgress(resId: Int, current: Long, total: Long) {
progressLayout.visibility = View.VISIBLE progressLayout.visibility = View.VISIBLE
val percent = 100L * (current.toFloat() / total.toFloat()) val percent = 100L * (current.toFloat() / total.toFloat())
val progressBar = progressLayout.findViewById<ProgressBar>(R.id.mediaProgressBar) val progressBar = progressLayout.findViewById<ProgressBar>(R.id.mediaProgressBar)
@ -128,10 +122,11 @@ private class ContentMediaProgressUpdater(private val progressLayout: ViewGroup,
val progressBar = progressLayout.findViewById<ProgressBar>(R.id.mediaProgressBar) val progressBar = progressLayout.findViewById<ProgressBar>(R.id.mediaProgressBar)
val progressTextView = progressLayout.findViewById<TextView>(R.id.mediaProgressTextView) val progressTextView = progressLayout.findViewById<TextView>(R.id.mediaProgressTextView)
progressBar?.isVisible = false progressBar?.isVisible = false
// TODO Red text
progressTextView?.text = state.throwable.localizedMessage progressTextView?.text = state.throwable.localizedMessage
} }


private fun handleSuccess(state: ContentUploadStateTracker.State.Success) { private fun handleSuccess(state: ContentUploadStateTracker.State.Success) {
// Nothing to do progressLayout.visibility = View.GONE
} }
} }