From 8836195f929cd404b0961b5ce867e44c8225cb02 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Thu, 22 May 2025 16:59:03 +0200
Subject: [PATCH] delete useless string & logic for conversationDeleteNotice

... string text was exactly the same

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../java/com/nextcloud/talk/chat/ChatActivity.kt  | 15 ++++-----------
 app/src/main/res/values/strings.xml               |  1 -
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
index 974fd4708..c92ca2e4a 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -1238,17 +1238,10 @@ class ChatActivity :
         }
         val deleteNoticeText = binding.conversationDeleteNotice.findViewById<TextView>(R.id.deletion_message)
 
-        if (currentConversation?.objectType != ConversationEnums.ObjectType.INSTANT_MEETING) {
-            deleteNoticeText.text = String.format(
-                resources.getString(R.string.nc_conversation_auto_delete_notice),
-                retentionPeriod
-            )
-        } else {
-            deleteNoticeText.text = String.format(
-                resources.getString(R.string.nc_conversation_auto_delete_warning),
-                retentionPeriod
-            )
-        }
+        deleteNoticeText.text = String.format(
+            resources.getString(R.string.nc_conversation_auto_delete_notice),
+            retentionPeriod
+        )
 
         if (ConversationUtils.isParticipantOwnerOrModerator(currentConversation!!)) {
             binding.conversationDeleteNotice.findViewById<MaterialButton>(R.id.delete_now_button).visibility =
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ab88925c4..6b23dff0a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -514,7 +514,6 @@ How to translate with transifex:
     <string name="nc_reply_privately">Reply privately</string>
     <string name="nc_delete_message">Delete</string>
     <string name="nc_conversation_auto_delete_notice">This conversation will be automatically deleted for everyone in %1$d days of no activity</string>
-    <string name="nc_conversation_auto_delete_warning">This conversation will be automatically deleted for everyone in %1$d day of no activity</string>
     <string name="nc_delete_now">Delete now</string>
     <string name="nc_keep">Keep</string>
     <string name="nc_delete_message_leaked_to_matterbridge">Message deleted successfully, but it might have been leaked to other services</string>