mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-20 13:08:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Keep screen on while playing media + fixed log file not opened if no extension is set for the file

Browse source
This commit is contained in:
Sylvain Berfini 2025-01-10 10:50:33 +01:00
parent e7f888ad78
commit c500761940
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/org/linphone/ui/fileviewer/viewmodel/FileViewModel.kt
View file

@ -125,10 +125,11 @@ class FileViewModel
}
filePath = file
val extension = FileUtils.getExtensionFromFileName(name)
val extension = FileUtils.getExtensionFromFileName(file)
val mime = FileUtils.getMimeTypeFromExtension(extension)
mimeType.postValue(mime)
when (FileUtils.getMimeType(mime)) {
val mimeType = FileUtils.getMimeType(mime)
when (mimeType) {
FileUtils.MimeType.Pdf -> {
Log.d("$TAG File [$file] seems to be a PDF")
loadPdf()
@ -138,7 +139,7 @@ class FileViewModel
loadPlainText()
}
else -> {
Log.e("$TAG Unexpected MIME type [$mime] for file at [$file]")
Log.e("$TAG Unexpected MIME type [$mimeType] for file at [$file] with extension [$extension]")
fileReadyEvent.value = Event(false)
}
}

2
app/src/main/java/org/linphone/ui/fileviewer/viewmodel/MediaViewModel.kt
View file

@ -93,7 +93,7 @@ class MediaViewModel
val name = FileUtils.getNameFromFilePath(file)
fileName.value = name
val extension = FileUtils.getExtensionFromFileName(name)
val extension = FileUtils.getExtensionFromFileName(file)
val mime = FileUtils.getMimeTypeFromExtension(extension)
when (FileUtils.getMimeType(mime)) {
FileUtils.MimeType.Image -> {

4
app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
View file

@ -1092,6 +1092,8 @@ open class ConversationFragment : SlidingPaneChildFragment() {
Log.i("$TAG Navigating to file viewer fragment with path [$path]")
val extension = FileUtils.getExtensionFromFileName(path)
val mime = FileUtils.getMimeTypeFromExtension(extension)
val mimeType = FileUtils.getMimeType(mime)
Log.i("$TAG Extension for file [$path] is [$extension], associated MIME type is [$mimeType]")
val bundle = Bundle()
bundle.apply {
@ -1102,7 +1104,7 @@ open class ConversationFragment : SlidingPaneChildFragment() {
putLong("timestamp", fileModel.fileCreationTimestamp)
putString("originalPath", fileModel.originalPath)
}
when (FileUtils.getMimeType(mime)) {
when (mimeType) {
FileUtils.MimeType.Image, FileUtils.MimeType.Video, FileUtils.MimeType.Audio -> {
bundle.putBoolean("isMedia", true)
sharedViewModel.displayFileEvent.value = Event(bundle)

1
app/src/main/res/layout/file_media_viewer_child_fragment.xml
View file

@ -17,6 +17,7 @@
android:onClick="@{toggleFullScreenModeClickListener}"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:keepScreenOn="true"
android:background="@color/bc_black">
<androidx.constraintlayout.widget.Group