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

delete useless string & logic for conversationDeleteNotice

Browse Source 
... string text was exactly the same

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2025-05-22 16:59:03 +02:00
parent 38eba2f6c9
commit 8836195f92
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1238,17 +1238,10 @@ class ChatActivity :
} }
val deleteNoticeText = binding.conversationDeleteNotice.findViewById<TextView>(R.id.deletion_message) val deleteNoticeText = binding.conversationDeleteNotice.findViewById<TextView>(R.id.deletion_message)
if (currentConversation?.objectType != ConversationEnums.ObjectType.INSTANT_MEETING) { deleteNoticeText.text = String.format(
deleteNoticeText.text = String.format( resources.getString(R.string.nc_conversation_auto_delete_notice),
resources.getString(R.string.nc_conversation_auto_delete_notice), retentionPeriod
retentionPeriod )
)
} else {
deleteNoticeText.text = String.format(
resources.getString(R.string.nc_conversation_auto_delete_warning),
retentionPeriod
)
}
if (ConversationUtils.isParticipantOwnerOrModerator(currentConversation!!)) { if (ConversationUtils.isParticipantOwnerOrModerator(currentConversation!!)) {
binding.conversationDeleteNotice.findViewById<MaterialButton>(R.id.delete_now_button).visibility = binding.conversationDeleteNotice.findViewById<MaterialButton>(R.id.delete_now_button).visibility =

1
app/src/main/res/values/strings.xml
View File

@ -514,7 +514,6 @@ How to translate with transifex:
<string name="nc_reply_privately">Reply privately</string> <string name="nc_reply_privately">Reply privately</string>
<string name="nc_delete_message">Delete</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_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_delete_now">Delete now</string>
<string name="nc_keep">Keep</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> <string name="nc_delete_message_leaked_to_matterbridge">Message deleted successfully, but it might have been leaked to other services</string>