From 8f0ef1900ea89ffd8719442985d955417aeeabf2 Mon Sep 17 00:00:00 2001
From: rapterjet2004 <juliuslinus1@gmail.com>
Date: Tue, 20 May 2025 11:40:15 -0500
Subject: [PATCH] Allows .HEIC files to be opened in app + themes the lock
 conversation switch

Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
---
 .../talk/conversationinfo/ConversationInfoActivity.kt        | 3 ++-
 .../main/java/com/nextcloud/talk/utils/FileViewerUtils.kt    | 5 ++++-
 app/src/main/java/com/nextcloud/talk/utils/Mimetype.kt       | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
index f9f5f0147..0e6731f3b 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
@@ -462,7 +462,8 @@ class ConversationInfoActivity :
                 binding.notificationSettingsView.importantConversationSwitch,
                 binding.guestAccessView.allowGuestsSwitch,
                 binding.guestAccessView.passwordProtectionSwitch,
-                binding.recordingConsentView.recordingConsentForConversationSwitch
+                binding.recordingConsentView.recordingConsentForConversationSwitch,
+                binding.lockConversationSwitch
             ).forEach(viewThemeUtils.talk::colorSwitch)
         }
     }
diff --git a/app/src/main/java/com/nextcloud/talk/utils/FileViewerUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/FileViewerUtils.kt
index 40a301f65..8461f1377 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/FileViewerUtils.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/FileViewerUtils.kt
@@ -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_WAV
 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_PNG
 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)
                 IMAGE_PNG,
                 IMAGE_JPEG,
-                IMAGE_GIF
+                IMAGE_GIF,
+                IMAGE_HEIC
                 -> openImageView(filename, mimetype)
                 TEXT_MARKDOWN,
                 TEXT_PLAIN
@@ -248,6 +250,7 @@ class FileViewerUtils(private val context: Context, private val user: User) {
         return when (mimetype) {
             IMAGE_PNG,
             IMAGE_JPEG,
+            IMAGE_HEIC,
             IMAGE_GIF,
             AUDIO_MPEG,
             AUDIO_WAV,
diff --git a/app/src/main/java/com/nextcloud/talk/utils/Mimetype.kt b/app/src/main/java/com/nextcloud/talk/utils/Mimetype.kt
index ad2cdc130..daf36d21d 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/Mimetype.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/Mimetype.kt
@@ -22,6 +22,7 @@ object Mimetype {
     const val IMAGE_JPEG = "image/jpeg"
     const val IMAGE_JPG = "image/jpg"
     const val IMAGE_GIF = "image/gif"
+    const val IMAGE_HEIC = "image/heic"
 
     const val VIDEO_MP4 = "video/mp4"
     const val VIDEO_QUICKTIME = "video/quicktime"