Hide filenames for media in chat.

Added setting to always show filenames.

Signed-off-by: Jens Zalzala <jens@shakingearthdigital.com>

Author: anakin78z

app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt

@@ -619,7 +619,8 @@ class ChatActivity :
                             isOneToOneConversation = isOneToOneConversation,
                             conversationThreadId = conversationThreadId,
                             hasChatPermission = this::participantPermissions.isInitialized &&
-                                participantPermissions.hasChatPermission()
+                                participantPermissions.hasChatPermission(),
+                            showMediaFilenames = appPreferences.showMediaFilenames
                         ),
                         callbacks = ChatViewCallbacks(
                             onLoadMore = { loadMoreMessagesCompose() },

app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt

@@ -781,6 +781,7 @@ class SettingsActivity :
         binding.run {
             listOf(
                 settingsShowEcosystemSwitch,
+                settingsShowMediaFilenamesSwitch,
                 settingsShowNotificationWarningSwitch,
                 settingsScreenLockSwitch,
                 settingsScreenSecuritySwitch,
@@ -978,6 +979,7 @@ class SettingsActivity :
 
     private fun setupCheckables(isOnline: Boolean) {
         setupShowEcosystemCheckable()
+        setupShowMediaFilenamesCheckable()
 
         binding.settingsShowNotificationWarningSwitch.isChecked =
             appPreferences.showRegularNotificationWarning
@@ -1052,6 +1054,15 @@ class SettingsActivity :
         }
     }
 
+    private fun setupShowMediaFilenamesCheckable() {
+        binding.settingsShowMediaFilenamesSwitch.isChecked = appPreferences.showMediaFilenames
+        binding.settingsShowMediaFilenames.setOnClickListener {
+            val isChecked = binding.settingsShowMediaFilenamesSwitch.isChecked
+            binding.settingsShowMediaFilenamesSwitch.isChecked = !isChecked
+            appPreferences.setShowMediaFilenames(!isChecked)
+        }
+    }
+
     private fun setupPhoneBookIntegrationSetting() {
         binding.settingsPhoneBookIntegrationSwitch.isChecked = appPreferences.isPhoneBookIntegrationEnabled
         binding.settingsPhoneBookIntegration.setOnClickListener {

app/src/main/java/com/nextcloud/talk/ui/chat/ChatMessageView.kt

@@ -51,7 +51,8 @@ private const val QUOTE_HIGHLIGHT_FADE_OUT_MILLIS = 1500
 data class ChatMessageContext(
     val isOneToOneConversation: Boolean = false,
     val conversationThreadId: Long? = null,
-    val hasChatPermission: Boolean = true
+    val hasChatPermission: Boolean = true,
+    val showMediaFilenames: Boolean = false
 )
 
 class ChatMessageCallbacks(
@@ -130,6 +131,7 @@ fun ChatMessageView(
                             message = message,
                             isOneToOneConversation = context.isOneToOneConversation,
                             conversationThreadId = context.conversationThreadId,
+                            showMediaFilenames = context.showMediaFilenames,
                             onImageClick = callbacks.onFileClick
                         )
                     }

app/src/main/java/com/nextcloud/talk/ui/chat/ChatView.kt

@@ -87,6 +87,7 @@ data class ChatViewState(
     val isOneToOneConversation: Boolean,
     val conversationThreadId: Long? = null,
     val hasChatPermission: Boolean = true,
+    val showMediaFilenames: Boolean = false,
     val initialUnreadCount: Int = 0,
     val initialShowUnreadPopup: Boolean = false
 )
@@ -311,7 +312,8 @@ fun ChatView(
                             context = ChatMessageContext(
                                 isOneToOneConversation = state.isOneToOneConversation,
                                 conversationThreadId = state.conversationThreadId,
-                                hasChatPermission = state.hasChatPermission
+                                hasChatPermission = state.hasChatPermission,
+                                showMediaFilenames = state.showMediaFilenames
                             ),
                             callbacks = ChatMessageCallbacks(
                                 onLongClick = callbacks.onLongClick,

app/src/main/java/com/nextcloud/talk/ui/chat/MediaMessage.kt

@@ -44,9 +44,16 @@ fun MediaMessage(
     message: ChatMessageUi,
     isOneToOneConversation: Boolean = false,
     conversationThreadId: Long? = null,
+    showMediaFilenames: Boolean = false,
     onImageClick: (Int) -> Unit
 ) {
-    val captionText = message.message.takeUnless { it == FILE_PLACEHOLDER_MESSAGE }
+    val hasExplicitCaption = message.plainMessage != FILE_PLACEHOLDER_MESSAGE
+    val hasPreview = !typeContent.previewUrl.isNullOrEmpty()
+    val captionText = when {
+        hasExplicitCaption -> message.message
+        !hasPreview || showMediaFilenames -> message.message
+        else -> null
+    }
     val hasCaption = captionText != null
     val mediaInset = 4.dp
     val mediaShape = remember(message.incoming) {

app/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferences.java

@@ -122,6 +122,10 @@ public interface AppPreferences {
 
     void removeShowEcosystem();
 
+    boolean getShowMediaFilenames();
+
+    void setShowMediaFilenames(boolean value);
+
     boolean isPhoneBookIntegrationEnabled();
 
     void setPhoneBookIntegration(boolean value);

app/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferencesImpl.kt

@@ -317,6 +317,18 @@ class AppPreferencesImpl(val context: Context) : AppPreferences {
         setShowEcosystem(false)
     }
 
+    override fun getShowMediaFilenames(): Boolean {
+        val read = runBlocking { async { readBoolean(SHOW_MEDIA_FILENAMES).first() } }.getCompleted()
+        return read
+    }
+
+    override fun setShowMediaFilenames(value: Boolean) =
+        runBlocking<Unit> {
+            async {
+                writeBoolean(SHOW_MEDIA_FILENAMES, value)
+            }
+        }
+
     override fun isPhoneBookIntegrationEnabled(): Boolean =
         runBlocking {
             async { readBoolean(PHONE_BOOK_INTEGRATION).first() }
@@ -636,6 +648,7 @@ class AppPreferencesImpl(val context: Context) : AppPreferences {
         const val SCREEN_LOCK = "screen_lock"
         const val INCOGNITO_KEYBOARD = "incognito_keyboard"
         const val SHOW_ECOSYSTEM = "SHOW_ECOSYSTEM"
+        const val SHOW_MEDIA_FILENAMES = "show_media_filenames"
         const val PHONE_BOOK_INTEGRATION = "phone_book_integration"
         const val LINK_PREVIEWS = "link_previews"
         const val SCREEN_LOCK_TIMEOUT = "screen_lock_timeout"

app/src/main/res/layout/activity_settings.xml

@@ -223,6 +223,41 @@
                         android:gravity="center_vertical" />
                 </LinearLayout>
 
+                <LinearLayout
+                    android:id="@+id/settings_show_media_filenames"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:orientation="horizontal"
+                    android:padding="@dimen/standard_padding">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical">
+
+                        <com.google.android.material.textview.MaterialTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/nc_settings_show_media_filenames_title"
+                            android:textSize="@dimen/headline_text_size" />
+
+                        <com.google.android.material.textview.MaterialTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/nc_settings_show_media_filenames_desc"
+                            android:paddingEnd="@dimen/standard_padding"/>
+                    </LinearLayout>
+
+                    <com.google.android.material.materialswitch.MaterialSwitch
+                        android:id="@+id/settings_show_media_filenames_switch"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:clickable="false"
+                        android:gravity="center_vertical" />
+                </LinearLayout>
+
             </LinearLayout>
 
             <LinearLayout

app/src/main/res/values/strings.xml

@@ -965,6 +965,9 @@ How to translate with transifex:
     <string name="no_scheduled_messages_offline">No connection to server - Scheduled messages could not be loaded</string>
     <string name="nc_show_ecosystem_title">Show app switcher</string>
     <string name="nc_show_ecosystem_description">Nextcloud app suggestions in account chooser dialog</string>
+    <string name="nc_settings_show_media_filenames_key" translatable="false">show_media_filenames</string>
+    <string name="nc_settings_show_media_filenames_title">Show filenames for media</string>
+    <string name="nc_settings_show_media_filenames_desc">Always show filenames below media attachments in chat</string>
     <string name="turn_on_background_blur">Turn on background blur</string>
     <string name="turn_off_background_blur">Turn off background blur</string>
 </resources>