浏览代码

fixed bug - Note to Self Now allows messages to expire and be deleted

Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
Julius Linus 1 年之前
父节点
当前提交
b5f49ccfaa
共有 1 个文件被更改,包括 10 次插入3 次删除
  1. 10 3
      app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt

+ 10 - 3
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)