gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-09 22:04:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4972 from nextcloud/issue-4941-support-heic

Browse Source 
Allows .HEIC files to be opened in app
This commit is contained in:
Marcel Hibbe 2025-05-22 16:56:19 +00:00 committed by GitHub
commit 2585439ddc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
View File

@ -462,7 +462,8 @@ class ConversationInfoActivity :
binding.notificationSettingsView.importantConversationSwitch, binding.notificationSettingsView.importantConversationSwitch,
binding.guestAccessView.allowGuestsSwitch, binding.guestAccessView.allowGuestsSwitch,
binding.guestAccessView.passwordProtectionSwitch, binding.guestAccessView.passwordProtectionSwitch,
binding.recordingConsentView.recordingConsentForConversationSwitch binding.recordingConsentView.recordingConsentForConversationSwitch,
binding.lockConversationSwitch
).forEach(viewThemeUtils.talk::colorSwitch) ).forEach(viewThemeUtils.talk::colorSwitch)
} }
} }

5
app/src/main/java/com/nextcloud/talk/utils/FileViewerUtils.kt
View File

@ -36,6 +36,7 @@ import com.nextcloud.talk.utils.Mimetype.AUDIO_MPEG
import com.nextcloud.talk.utils.Mimetype.AUDIO_OGG import com.nextcloud.talk.utils.Mimetype.AUDIO_OGG
import com.nextcloud.talk.utils.Mimetype.AUDIO_WAV import com.nextcloud.talk.utils.Mimetype.AUDIO_WAV
import com.nextcloud.talk.utils.Mimetype.IMAGE_GIF import com.nextcloud.talk.utils.Mimetype.IMAGE_GIF
import com.nextcloud.talk.utils.Mimetype.IMAGE_HEIC
import com.nextcloud.talk.utils.Mimetype.IMAGE_JPEG import com.nextcloud.talk.utils.Mimetype.IMAGE_JPEG
import com.nextcloud.talk.utils.Mimetype.IMAGE_PNG import com.nextcloud.talk.utils.Mimetype.IMAGE_PNG
import com.nextcloud.talk.utils.Mimetype.TEXT_MARKDOWN import com.nextcloud.talk.utils.Mimetype.TEXT_MARKDOWN
@ -155,7 +156,8 @@ class FileViewerUtils(private val context: Context, private val user: User) {
-> openMediaView(filename, mimetype) -> openMediaView(filename, mimetype)
IMAGE_PNG, IMAGE_PNG,
IMAGE_JPEG, IMAGE_JPEG,
IMAGE_GIF IMAGE_GIF,
IMAGE_HEIC
-> openImageView(filename, mimetype) -> openImageView(filename, mimetype)
TEXT_MARKDOWN, TEXT_MARKDOWN,
TEXT_PLAIN TEXT_PLAIN
@ -248,6 +250,7 @@ class FileViewerUtils(private val context: Context, private val user: User) {
return when (mimetype) { return when (mimetype) {
IMAGE_PNG, IMAGE_PNG,
IMAGE_JPEG, IMAGE_JPEG,
IMAGE_HEIC,
IMAGE_GIF, IMAGE_GIF,
AUDIO_MPEG, AUDIO_MPEG,
AUDIO_WAV, AUDIO_WAV,

1
app/src/main/java/com/nextcloud/talk/utils/Mimetype.kt
View File

@ -22,6 +22,7 @@ object Mimetype {
const val IMAGE_JPEG = "image/jpeg" const val IMAGE_JPEG = "image/jpeg"
const val IMAGE_JPG = "image/jpg" const val IMAGE_JPG = "image/jpg"
const val IMAGE_GIF = "image/gif" const val IMAGE_GIF = "image/gif"
const val IMAGE_HEIC = "image/heic"
const val VIDEO_MP4 = "video/mp4" const val VIDEO_MP4 = "video/mp4"
const val VIDEO_QUICKTIME = "video/quicktime" const val VIDEO_QUICKTIME = "video/quicktime"