mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-23 18:05:59 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4547 from vector-im/feature/adm/voice-files

Browse source 
Timeline editing and offline voice message fixes
This commit is contained in:
Benoit Marty 2021-11-24 11:08:05 +01:00 committed by GitHub
commit b3d1c4fbdb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/3833.bugfix Normal file
View file

@ -0,0 +1 @@
Fixing queued voice message failing to send or retry

10
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
View file

@ -279,6 +279,11 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
Timber.e(failure, "## Failed to update file cache")
}
// Delete the temporary voice message file
if (params.attachment.type == ContentAttachmentData.Type.AUDIO && params.attachment.mimeType == MimeTypes.Ogg) {
context.contentResolver.delete(params.attachment.queryUri, null, null)
}
val uploadThumbnailResult = dealWithThumbnail(params)
handleSuccess(params,
@ -299,11 +304,6 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
filesToDelete.forEach {
tryOrNull { it.delete() }
}
// Delete the temporary voice message file
if (params.attachment.type == ContentAttachmentData.Type.AUDIO && params.attachment.mimeType == MimeTypes.Ogg) {
context.contentResolver.delete(params.attachment.queryUri, null, null)
}
}
}

5
vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
View file

@ -58,10 +58,7 @@ data class MessageComposerViewState(
VoiceMessageRecorderView.RecordingUiState.Started -> true
}
val isVoiceMessageIdle = when (voiceRecordingUiState) {
VoiceMessageRecorderView.RecordingUiState.None, VoiceMessageRecorderView.RecordingUiState.Cancelled -> false
else -> true
}
val isVoiceMessageIdle = !isVoiceRecording
val isComposerVisible = canSendMessage && !isVoiceRecording
val isVoiceMessageRecorderVisible = canSendMessage && !isSendButtonVisible

5
vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageHelper.kt
View file

@ -76,9 +76,8 @@ class VoiceMessageHelper @Inject constructor(
}
try {
voiceMessageFile?.let {
val outputFileUri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".fileProvider", it)
return outputFileUri
?.toMultiPickerAudioType(context)
val outputFileUri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".fileProvider", it, "Voice message.${it.extension}")
return outputFileUri.toMultiPickerAudioType(context)
?.apply {
waveform = if (amplitudeList.size < 50) {
amplitudeList

14
vector/src/main/java/im/vector/app/features/voice/AbstractVoiceRecorder.kt
View file

@ -18,9 +18,12 @@ package im.vector.app.features.voice
import android.content.Context
import android.media.MediaRecorder
import android.net.Uri
import android.os.Build
import org.matrix.android.sdk.api.session.content.ContentAttachmentData
import java.io.File
import java.io.FileOutputStream
import java.util.UUID
abstract class AbstractVoiceRecorder(
private val context: Context,
@ -59,7 +62,7 @@ abstract class AbstractVoiceRecorder(
override fun startRecord() {
init()
outputFile = File(outputDirectory, "Voice message.$filenameExt")
outputFile = File(outputDirectory, "${UUID.randomUUID()}$filenameExt")
val mr = mediaRecorder ?: return
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@ -100,3 +103,12 @@ abstract class AbstractVoiceRecorder(
return convertFile(outputFile)
}
}
@Suppress("UNUSED") // preemptively added for https://github.com/vector-im/element-android/pull/4527
private fun ContentAttachmentData.findVoiceFile(baseDirectory: File): File {
return File(baseDirectory, queryUri.takePathAfter(baseDirectory.name))
}
private fun Uri.takePathAfter(after: String): String {
return pathSegments.takeLastWhile { it != after }.joinToString(separator = "/") { it }
}