From 4b66e0516d6586fe10110fc3586f3331fd847471 Mon Sep 17 00:00:00 2001 From: charles Date: Mon, 12 Dec 2022 13:14:57 +1100 Subject: [PATCH] Default expiration timer value to zero --- .../conversation/expiration/ExpirationSettingsViewModel.kt | 3 ++- .../securesms/conversation/v2/ConversationActivityV2.kt | 4 ---- .../conversation/v2/menus/ConversationMenuHelper.kt | 4 ++-- .../java/org/thoughtcrime/securesms/database/Storage.kt | 2 +- .../org/session/libsession/database/StorageProtocol.kt | 2 +- .../org/session/libsession/messaging/messages/Message.kt | 7 +++++-- .../messaging/sending_receiving/ReceivedMessageHandler.kt | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsViewModel.kt index 1663e97a4a..e36972e74a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsViewModel.kt @@ -87,7 +87,8 @@ class ExpirationSettingsViewModel( val expiresIn = _selectedExpirationTimer.value?.value?.toIntOrNull() ?: 0 val expiryType = _selectedExpirationType.value val expiryChangeTimestampMs = System.currentTimeMillis() - storage.addExpirationConfiguration(ExpirationConfiguration(threadId, expiresIn, expiryType, expiryChangeTimestampMs)) + storage.setExpirationConfiguration(ExpirationConfiguration(threadId, expiresIn, expiryType, expiryChangeTimestampMs)) + } @dagger.assisted.AssistedFactory diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt index 9635bd4d72..aa4eb00be4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt @@ -932,10 +932,6 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe if (item.itemId == android.R.id.home) { return false } - else if (item.itemId == R.id.menu_overflow) { - binding?.toolbar?.showOverflowMenu() - return false - } return viewModel.recipient?.let { recipient -> ConversationMenuHelper.onOptionItemSelected(this, item, recipient) } ?: false diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt index 0e92f7bd13..9efc71f9d1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt @@ -58,8 +58,8 @@ object ConversationMenuHelper { if (thread.isGroupRecipient) { item.setIcon(R.drawable.ic_outline_settings_24) } else { - item.setActionView(R.layout.view_profile_overflow) - item.actionView.setOnClickListener { onOptionsItemSelected(item) } + /*TODO: item.setActionView(R.layout.view_profile_overflow) + item.actionView.setOnClickListener { onOptionsItemSelected(item) }*/ } val menu = item.subMenu // Expiring messages diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt index 39a068f085..77fff1b7e2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt @@ -971,7 +971,7 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context, return DatabaseComponent.get(context).expirationConfigurationDatabase().getExpirationConfiguration(threadId) } - override fun addExpirationConfiguration(config: ExpirationConfiguration) { + override fun setExpirationConfiguration(config: ExpirationConfiguration) { DatabaseComponent.get(context).expirationConfigurationDatabase().setExpirationConfiguration(config) } diff --git a/libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt b/libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt index 4c7293b675..c50e20b472 100644 --- a/libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt +++ b/libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt @@ -200,7 +200,7 @@ interface StorageProtocol { fun unblock(toUnblock: List) fun blockedContacts(): List fun getExpirationConfiguration(threadId: Long): ExpirationConfiguration? - fun addExpirationConfiguration(config: ExpirationConfiguration) + fun setExpirationConfiguration(config: ExpirationConfiguration) fun getExpiringMessages(messageIds: LongArray): List> fun updateDisappearingState(address: String, disappearingState: Recipient.DisappearingState) } diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/Message.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/Message.kt index a94a59f955..9186a995ac 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/Message.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/Message.kt @@ -40,8 +40,11 @@ abstract class Message { } fun setExpirationConfigurationIfNeeded(builder: SignalServiceProtos.Content.Builder) { - val threadId = threadID ?: return - val config = MessagingModuleConfiguration.shared.storage.getExpirationConfiguration(threadId) ?: return + val config = threadID?.let { MessagingModuleConfiguration.shared.storage.getExpirationConfiguration(it) } + ?: run { + builder.expirationTimer = 0 + return + } builder.expirationTimer = config.durationSeconds if (config.isEnabled) { builder.expirationType = config.expirationType diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt index e3cb7f924d..a28c1046d1 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt @@ -101,7 +101,7 @@ fun updateExpirationConfigurationIfNeeded(message: Message, proto: SignalService type, proto.lastDisappearingMessageChangeTimestamp ) - storage.addExpirationConfiguration(remoteConfig) + storage.setExpirationConfiguration(remoteConfig) } // region Control Messages