From 023424a87be3c2147c1af86fa2f52a93934fecf4 Mon Sep 17 00:00:00 2001 From: jubb Date: Wed, 9 Mar 2022 14:23:44 +1100 Subject: [PATCH] fix: add name update in action bar on modified, change where approvedMe is set --- .../securesms/conversation/v2/ConversationActivityV2.kt | 1 + .../java/org/thoughtcrime/securesms/database/Storage.kt | 8 ++++++++ .../messaging/sending_receiving/ReceivedMessageHandler.kt | 2 -- 3 files changed, 9 insertions(+), 2 deletions(-) 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 12db75327..d6f687f16 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 @@ -585,6 +585,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe updateSubtitle() showOrHideInputIfNeeded() actionBarBinding?.profilePictureView?.update(recipient) + actionBarBinding?.conversationTitleView?.text = recipient.toShortString() } } 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 322787cff..657e699b5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt @@ -124,6 +124,14 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context, senderAddress } val targetRecipient = Recipient.from(context, targetAddress, false) + if (!targetRecipient.isGroupRecipient) { + val recipientDb = DatabaseComponent.get(context).recipientDatabase() + if (isUserSender) { + recipientDb.setApproved(targetRecipient, true) + } else { + recipientDb.setApprovedMe(targetRecipient, true) + } + } if (message.isMediaMessage() || attachments.isNotEmpty()) { val quote: Optional = if (quotes != null) Optional.of(quotes) else Optional.absent() val linkPreviews: Optional> = if (linkPreview.isEmpty()) Optional.absent() else Optional.of(linkPreview.mapNotNull { it!! }) 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 c6e21a7f3..088e5932b 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 @@ -208,8 +208,6 @@ fun MessageReceiver.handleVisibleMessage(message: VisibleMessage, proto: SignalS profileManager.setUnidentifiedAccessMode(context, recipient, Recipient.UnidentifiedAccessMode.UNKNOWN) profileManager.setProfilePictureURL(context, recipient, profile.profilePictureURL!!) } - // set approved on receive message - storage.setRecipientApprovedMe(recipient, true) } // Parse quote if needed var quoteModel: QuoteModel? = null