gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 19:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
This commit is contained in:
Julius Linus 2023-11-27 10:57:24 -06:00 committed by Marcel Hibbe
parent b1568e7f49
commit b5f49ccfaa
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
View File

@ -57,9 +57,9 @@ import com.nextcloud.talk.activities.MainActivity
import com.nextcloud.talk.adapters.items.ParticipantItem import com.nextcloud.talk.adapters.items.ParticipantItem
import com.nextcloud.talk.api.NcApi import com.nextcloud.talk.api.NcApi
import com.nextcloud.talk.application.NextcloudTalkApplication 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.BasicListItemWithImage
import com.nextcloud.talk.bottomsheet.items.listItemsWithImage import com.nextcloud.talk.bottomsheet.items.listItemsWithImage
import com.nextcloud.talk.contacts.ContactsActivity
import com.nextcloud.talk.conversationinfoedit.ConversationInfoEditActivity import com.nextcloud.talk.conversationinfoedit.ConversationInfoEditActivity
import com.nextcloud.talk.data.user.model.User import com.nextcloud.talk.data.user.model.User
import com.nextcloud.talk.databinding.ActivityConversationInfoBinding import com.nextcloud.talk.databinding.ActivityConversationInfoBinding
@ -663,7 +663,15 @@ class ConversationInfoActivity :
showOptionsMenu() showOptionsMenu()
} else { } else {
binding.addParticipantsAction.visibility = GONE 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) { if (!isDestroyed) {
@ -823,7 +831,6 @@ class ConversationInfoActivity :
private fun initExpiringMessageOption() { private fun initExpiringMessageOption() {
if (conversation!!.isParticipantOwnerOrModerator && if (conversation!!.isParticipantOwnerOrModerator &&
!ConversationUtils.isNoteToSelfConversation(ConversationModel.mapToConversationModel(conversation!!)) &&
CapabilitiesUtilNew.hasSpreedFeatureCapability(conversationUser, "message-expiration") CapabilitiesUtilNew.hasSpreedFeatureCapability(conversationUser, "message-expiration")
) { ) {
databaseStorageModule?.setMessageExpiration(conversation!!.messageExpiration) databaseStorageModule?.setMessageExpiration(conversation!!.messageExpiration)