From ce968cc5f8c378646e2ec7cb775b588cd9d48bc5 Mon Sep 17 00:00:00 2001 From: ThomasSession Date: Thu, 10 Oct 2024 13:30:09 +1100 Subject: [PATCH 1/3] Only force a contact to visible if the approval goes from 'not approved' to 'approved' --- .../main/java/org/thoughtcrime/securesms/database/Storage.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 d7ad48b4972..28794e8ce6a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt @@ -1582,8 +1582,11 @@ open class Storage( DatabaseComponent.get(context).recipientDatabase().setApproved(recipient, approved) if (recipient.isLocalNumber || !recipient.isContactRecipient) return configFactory.contacts?.upsertContact(recipient.address.serialize()) { + // if the contact wasn't approved before but is approved now, make sure it's visible + if(approved && !this.approved) this.priority = PRIORITY_VISIBLE + + // update approval this.approved = approved - this.priority = PRIORITY_VISIBLE } } From 92f66b45348e93772fc88f322743498154e5f0e2 Mon Sep 17 00:00:00 2001 From: ThomasSession Date: Fri, 11 Oct 2024 11:53:14 +1100 Subject: [PATCH 2/3] Fixing store crash by removing non required spannable --- .../securesms/conversation/v2/dialogs/DownloadDialog.kt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt index f9e45547d1d..ac181b98ff0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt @@ -37,11 +37,7 @@ class DownloadDialog(private val recipient: Recipient) : DialogFragment() { val explanation = Phrase.from(context, R.string.attachmentsAutoDownloadModalDescription) .put(CONVERSATION_NAME_KEY, recipient.toShortString()) .format() - val spannable = SpannableStringBuilder(explanation) - - val startIndex = explanation.indexOf(name) - spannable.setSpan(StyleSpan(Typeface.BOLD), startIndex, startIndex + name.count(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) - text(spannable) + text(explanation) button(R.string.download, R.string.AccessibilityId_download) { trust() } cancelButton { dismiss() } From 9ffaed51b2976775dbe465b936f587634a351f5e Mon Sep 17 00:00:00 2001 From: ThomasSession Date: Fri, 11 Oct 2024 15:37:16 +1100 Subject: [PATCH 3/3] v1.20.2 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7ecb6e45f5e..95e37a849c1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ configurations.forEach { it.exclude module: "commons-logging" } -def canonicalVersionCode = 383 -def canonicalVersionName = "1.20.1" +def canonicalVersionCode = 384 +def canonicalVersionName = "1.20.2" def postFixSize = 10 def abiPostFix = ['armeabi-v7a' : 1,