Skip to content

fix: use content resolver for sending audio messages (WPB-17546) #4017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yamilmedina merged 1 commit into from
May 12, 2025
Merged

fix: use content resolver for sending audio messages (WPB-17546) #4017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .../main/kotlin/com/wire/android/ui/home/messagecomposer/recordaudio/RecordAudioViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue
import androidx.core.net.toUri
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.wire.android.appLogger
Expand All @@ -37,6 +36,7 @@
import com.wire.android.util.SUPPORTED_AUDIO_MIME_TYPE
import com.wire.android.util.dispatchers.DispatcherProvider
import com.wire.android.util.fileDateTime
import com.wire.android.util.fromNioPathToContentUri
import com.wire.android.util.getAudioLengthInMs
import com.wire.android.util.ui.UIText
import com.wire.kalium.logic.data.asset.KaliumFileSystem
Expand Down Expand Up @@ -321,12 +321,12 @@
onAudioRecorded(
UriAsset(
uri = if (didSucceed) {
audioMediaRecorder.mp4OutputPath!!.toFile().toUri()
context.fromNioPathToContentUri(nioPath = audioMediaRecorder.mp4OutputPath!!.toNioPath())

Check warning on line 324 in app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/recordaudio/RecordAudioViewModel.kt

View check run for this annotation

Codecov / codecov/patch

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

Added line #L324 was not covered by tests
} else {
if (state.shouldApplyEffects) {
state.effectsOutputFile!!.toUri()
context.fromNioPathToContentUri(nioPath = state.effectsOutputFile!!.toPath())

Check warning on line 327 in app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/recordaudio/RecordAudioViewModel.kt

View check run for this annotation

Codecov / codecov/patch

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

Added line #L327 was not covered by tests
} else {
state.originalOutputFile!!.toUri()
context.fromNioPathToContentUri(nioPath = state.originalOutputFile!!.toPath())

Check warning on line 329 in app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/recordaudio/RecordAudioViewModel.kt

View check run for this annotation

Codecov / codecov/patch

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

Added line #L329 was not covered by tests
}
},
mimeType = if (didSucceed) {
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/kotlin/com/wire/android/util/FileUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
import kotlinx.coroutines.withContext
import kotlinx.serialization.json.Json
import okio.Path
import okio.Path.Companion.toOkioPath
import java.io.File
import java.io.FileNotFoundException
import java.io.IOException
Expand Down Expand Up @@ -180,6 +181,8 @@
return insertedUri
}

fun Context.fromNioPathToContentUri(nioPath: java.nio.file.Path): Uri = this.pathToUri(nioPath.toOkioPath(), null)

Check warning on line 184 in app/src/main/kotlin/com/wire/android/util/FileUtil.kt

View check run for this annotation

Codecov / codecov/patch

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

Added line #L184 was not covered by tests

fun Context.pathToUri(assetDataPath: Path, assetName: String?): Uri =
FileProvider.getUriForFile(this, getProviderAuthority(), assetDataPath.toFile(), assetName ?: assetDataPath.name)

Expand Down
Loading