Merge pull request #1689 from oxen-io/release/1.20.2

Release/1.20.2

Author: ThomasSession

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,

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() }

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
         }
     }