Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Merge pull request #3903 from element-hq/feature/bma/fixPhotoName

Browse source 
Fix photo / video name
This commit is contained in:
Benoit Marty 2024-11-20 21:29:02 +01:00 • committed by GitHub
commit fb16655594
1 changed files with 16 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

40
libraries/mediapickers/impl/src/main/kotlin/io/element/android/libraries/mediapickers/impl/DefaultPickerProvider.kt
View file

@ -13,25 +13,23 @@ import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.PickVisualMediaRequest import androidx.activity.result.PickVisualMediaRequest
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalInspectionMode import androidx.compose.ui.platform.LocalInspectionMode
import androidx.core.content.FileProvider import androidx.core.content.FileProvider
import com.squareup.anvil.annotations.ContributesBinding import com.squareup.anvil.annotations.ContributesBinding
import io.element.android.libraries.di.AppScope import io.element.android.libraries.di.AppScope
import io.element.android.libraries.di.ApplicationContext
import io.element.android.libraries.mediapickers.api.ComposePickerLauncher import io.element.android.libraries.mediapickers.api.ComposePickerLauncher
import io.element.android.libraries.mediapickers.api.NoOpPickerLauncher import io.element.android.libraries.mediapickers.api.NoOpPickerLauncher
import io.element.android.libraries.mediapickers.api.PickerLauncher import io.element.android.libraries.mediapickers.api.PickerLauncher
import io.element.android.libraries.mediapickers.api.PickerProvider import io.element.android.libraries.mediapickers.api.PickerProvider
import io.element.android.libraries.mediapickers.api.PickerType import io.element.android.libraries.mediapickers.api.PickerType
import java.io.File import java.io.File
import java.util.UUID
import javax.inject.Inject import javax.inject.Inject
@ContributesBinding(AppScope::class) @ContributesBinding(AppScope::class)
class DefaultPickerProvider(private val isInTest: Boolean) : PickerProvider { class DefaultPickerProvider @Inject constructor(
@Inject @ApplicationContext private val context: Context,
constructor() : this(false) ) : PickerProvider {
/** /**
* Remembers and returns a [PickerLauncher] for a certain media/file [type]. * Remembers and returns a [PickerLauncher] for a certain media/file [type].
*/ */
@ -40,7 +38,7 @@ class DefaultPickerProvider(private val isInTest: Boolean) : PickerProvider {
type: PickerType<Input, Output>, type: PickerType<Input, Output>,
onResult: (Output) -> Unit, onResult: (Output) -> Unit,
): PickerLauncher<Input, Output> { ): PickerLauncher<Input, Output> {
return if (LocalInspectionMode.current || isInTest) { return if (LocalInspectionMode.current) {
NoOpPickerLauncher { } NoOpPickerLauncher { }
} else { } else {
val contract = type.getContract() val contract = type.getContract()
@ -56,7 +54,7 @@ class DefaultPickerProvider(private val isInTest: Boolean) : PickerProvider {
@Composable @Composable
override fun registerGalleryImagePicker(onResult: (Uri?) -> Unit): PickerLauncher<PickVisualMediaRequest, Uri?> { override fun registerGalleryImagePicker(onResult: (Uri?) -> Unit): PickerLauncher<PickVisualMediaRequest, Uri?> {
// Tests and UI preview can't handle Contexts, so we might as well disable the whole picker // Tests and UI preview can't handle Contexts, so we might as well disable the whole picker
return if (LocalInspectionMode.current || isInTest) { return if (LocalInspectionMode.current) {
NoOpPickerLauncher { onResult(null) } NoOpPickerLauncher { onResult(null) }
} else { } else {
rememberPickerLauncher(type = PickerType.Image) { uri -> onResult(uri) } rememberPickerLauncher(type = PickerType.Image) { uri -> onResult(uri) }
@ -72,10 +70,9 @@ class DefaultPickerProvider(private val isInTest: Boolean) : PickerProvider {
onResult: (uri: Uri?, mimeType: String?) -> Unit onResult: (uri: Uri?, mimeType: String?) -> Unit
): PickerLauncher<PickVisualMediaRequest, Uri?> { ): PickerLauncher<PickVisualMediaRequest, Uri?> {
// Tests and UI preview can't handle Contexts, so we might as well disable the whole picker // Tests and UI preview can't handle Contexts, so we might as well disable the whole picker
return if (LocalInspectionMode.current || isInTest) { return if (LocalInspectionMode.current) {
NoOpPickerLauncher { onResult(null, null) } NoOpPickerLauncher { onResult(null, null) }
} else { } else {
val context = LocalContext.current
rememberPickerLauncher(type = PickerType.ImageAndVideo) { uri -> rememberPickerLauncher(type = PickerType.ImageAndVideo) { uri ->
val mimeType = uri?.let { context.contentResolver.getType(it) } val mimeType = uri?.let { context.contentResolver.getType(it) }
onResult(uri, mimeType) onResult(uri, mimeType)
@ -93,7 +90,7 @@ class DefaultPickerProvider(private val isInTest: Boolean) : PickerProvider {
onResult: (Uri?) -> Unit, onResult: (Uri?) -> Unit,
): PickerLauncher<String, Uri?> { ): PickerLauncher<String, Uri?> {
// Tests and UI preview can't handle Context or FileProviders, so we might as well disable the whole picker // Tests and UI preview can't handle Context or FileProviders, so we might as well disable the whole picker
return if (LocalInspectionMode.current || isInTest) { return if (LocalInspectionMode.current) {
NoOpPickerLauncher { onResult(null) } NoOpPickerLauncher { onResult(null) }
} else { } else {
rememberPickerLauncher(type = PickerType.File(mimeType)) { uri -> onResult(uri) } rememberPickerLauncher(type = PickerType.File(mimeType)) { uri -> onResult(uri) }
@ -107,12 +104,11 @@ class DefaultPickerProvider(private val isInTest: Boolean) : PickerProvider {
@Composable @Composable
override fun registerCameraPhotoPicker(onResult: (Uri?) -> Unit): PickerLauncher<Uri, Boolean> { override fun registerCameraPhotoPicker(onResult: (Uri?) -> Unit): PickerLauncher<Uri, Boolean> {
// Tests and UI preview can't handle Context or FileProviders, so we might as well disable the whole picker // Tests and UI preview can't handle Context or FileProviders, so we might as well disable the whole picker
return if (LocalInspectionMode.current || isInTest) { return if (LocalInspectionMode.current) {
NoOpPickerLauncher { onResult(null) } NoOpPickerLauncher { onResult(null) }
} else { } else {
val context = LocalContext.current val tmpFile = remember { getTemporaryFile("photo.jpg") }
val tmpFile = remember { getTemporaryFile(context) } val tmpFileUri = remember(tmpFile) { getTemporaryUri(tmpFile) }
val tmpFileUri = remember(tmpFile) { getTemporaryUri(context, tmpFile) }
rememberPickerLauncher(type = PickerType.Camera.Photo(tmpFileUri)) { success -> rememberPickerLauncher(type = PickerType.Camera.Photo(tmpFileUri)) { success ->
// Execute callback // Execute callback
onResult(if (success) tmpFileUri else null) onResult(if (success) tmpFileUri else null)
@ -127,12 +123,11 @@ class DefaultPickerProvider(private val isInTest: Boolean) : PickerProvider {
@Composable @Composable
override fun registerCameraVideoPicker(onResult: (Uri?) -> Unit): PickerLauncher<Uri, Boolean> { override fun registerCameraVideoPicker(onResult: (Uri?) -> Unit): PickerLauncher<Uri, Boolean> {
// Tests and UI preview can't handle Context or FileProviders, so we might as well disable the whole picker // Tests and UI preview can't handle Context or FileProviders, so we might as well disable the whole picker
return if (LocalInspectionMode.current || isInTest) { return if (LocalInspectionMode.current) {
NoOpPickerLauncher { onResult(null) } NoOpPickerLauncher { onResult(null) }
} else { } else {
val context = LocalContext.current val tmpFile = remember { getTemporaryFile("video.mp4") }
val tmpFile = remember { getTemporaryFile(context) } val tmpFileUri = remember(tmpFile) { getTemporaryUri(tmpFile) }
val tmpFileUri = remember(tmpFile) { getTemporaryUri(context, tmpFile) }
rememberPickerLauncher(type = PickerType.Camera.Video(tmpFileUri)) { success -> rememberPickerLauncher(type = PickerType.Camera.Video(tmpFileUri)) { success ->
// Execute callback // Execute callback
onResult(if (success) tmpFileUri else null) onResult(if (success) tmpFileUri else null)
@ -141,15 +136,12 @@ class DefaultPickerProvider(private val isInTest: Boolean) : PickerProvider {
} }
private fun getTemporaryFile( private fun getTemporaryFile(
context: Context, filename: String,
baseFolder: File = context.cacheDir,
filename: String = UUID.randomUUID().toString(),
): File { ): File {
return File(baseFolder, filename) return File(context.cacheDir, filename)
} }
private fun getTemporaryUri( private fun getTemporaryUri(
context: Context,
file: File, file: File,
): Uri { ): Uri {
val authority = "${context.packageName}.fileprovider" val authority = "${context.packageName}.fileprovider"