From b5f49ccfaa1bac422f9efb4fe40df4dd843df075 Mon Sep 17 00:00:00 2001 From: Julius Linus Date: Mon, 27 Nov 2023 10:57:24 -0600 Subject: [PATCH] fixed bug - Note to Self Now allows messages to expire and be deleted Signed-off-by: rapterjet2004 --- .../conversationinfo/ConversationInfoActivity.kt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 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 8bf1be73a..f068d008d 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt @@ -57,9 +57,9 @@ import com.nextcloud.talk.activities.MainActivity import com.nextcloud.talk.adapters.items.ParticipantItem import com.nextcloud.talk.api.NcApi import com.nextcloud.talk.application.NextcloudTalkApplication -import com.nextcloud.talk.contacts.ContactsActivity import com.nextcloud.talk.bottomsheet.items.BasicListItemWithImage import com.nextcloud.talk.bottomsheet.items.listItemsWithImage +import com.nextcloud.talk.contacts.ContactsActivity import com.nextcloud.talk.conversationinfoedit.ConversationInfoEditActivity import com.nextcloud.talk.data.user.model.User import com.nextcloud.talk.databinding.ActivityConversationInfoBinding @@ -663,7 +663,15 @@ class ConversationInfoActivity : showOptionsMenu() } else { binding.addParticipantsAction.visibility = GONE - binding.clearConversationHistory.visibility = GONE + + if (ConversationUtils.isNoteToSelfConversation( + ConversationModel.mapToConversationModel(conversation!!) + ) + ) { + binding.notificationSettingsView.notificationSettings.visibility = VISIBLE + } else { + binding.clearConversationHistory.visibility = GONE + } } if (!isDestroyed) { @@ -823,7 +831,6 @@ class ConversationInfoActivity : private fun initExpiringMessageOption() { if (conversation!!.isParticipantOwnerOrModerator && - !ConversationUtils.isNoteToSelfConversation(ConversationModel.mapToConversationModel(conversation!!)) && CapabilitiesUtilNew.hasSpreedFeatureCapability(conversationUser, "message-expiration") ) { databaseStorageModule?.setMessageExpiration(conversation!!.messageExpiration)