Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit06bea9d

Browse files
authored
fix: use content resolver for sending audio messages (WPB-17546) (#4017)
1 parent4ba8d17 commit06bea9d

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

‎app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/recordaudio/RecordAudioViewModel.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import android.content.Context
2121
importandroidx.compose.runtime.getValue
2222
importandroidx.compose.runtime.mutableStateOf
2323
importandroidx.compose.runtime.setValue
24-
importandroidx.core.net.toUri
2524
importandroidx.lifecycle.ViewModel
2625
importandroidx.lifecycle.viewModelScope
2726
importcom.wire.android.appLogger
@@ -37,6 +36,7 @@ import com.wire.android.util.CurrentScreenManager
3736
importcom.wire.android.util.SUPPORTED_AUDIO_MIME_TYPE
3837
importcom.wire.android.util.dispatchers.DispatcherProvider
3938
importcom.wire.android.util.fileDateTime
39+
importcom.wire.android.util.fromNioPathToContentUri
4040
importcom.wire.android.util.getAudioLengthInMs
4141
importcom.wire.android.util.ui.UIText
4242
importcom.wire.kalium.logic.data.asset.KaliumFileSystem
@@ -321,12 +321,12 @@ class RecordAudioViewModel @Inject constructor(
321321
onAudioRecorded(
322322
UriAsset(
323323
uri=if (didSucceed) {
324-
audioMediaRecorder.mp4OutputPath!!.toFile().toUri()
324+
context.fromNioPathToContentUri(nioPath=audioMediaRecorder.mp4OutputPath!!.toNioPath())
325325
}else {
326326
if (state.shouldApplyEffects) {
327-
state.effectsOutputFile!!.toUri()
327+
context.fromNioPathToContentUri(nioPath=state.effectsOutputFile!!.toPath())
328328
}else {
329-
state.originalOutputFile!!.toUri()
329+
context.fromNioPathToContentUri(nioPath=state.originalOutputFile!!.toPath())
330330
}
331331
},
332332
mimeType=if (didSucceed) {

‎app/src/main/kotlin/com/wire/android/util/FileUtil.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ import kotlinx.coroutines.Dispatchers
5757
importkotlinx.coroutines.withContext
5858
importkotlinx.serialization.json.Json
5959
importokio.Path
60+
importokio.Path.Companion.toOkioPath
6061
importjava.io.File
6162
importjava.io.FileNotFoundException
6263
importjava.io.IOException
@@ -180,6 +181,8 @@ private fun Context.saveFileDataToMediaFolder(assetName: String, downloadedDataP
180181
return insertedUri
181182
}
182183

184+
fun Context.fromNioPathToContentUri(nioPath: java.nio.file.Path):Uri=this.pathToUri(nioPath.toOkioPath(),null)
185+
183186
fun Context.pathToUri(assetDataPath:Path,assetName:String?):Uri=
184187
FileProvider.getUriForFile(this, getProviderAuthority(), assetDataPath.toFile(), assetName?: assetDataPath.name)
185188

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp