TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-21 15:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Release/1.20.2
This commit is contained in:
ThomasSession 2024-10-14 10:52:30 +11:00 committed by GitHub
commit d5e3836430
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -13,8 +13,8 @@ configurations.forEach {
it.exclude module: "commons-logging" it.exclude module: "commons-logging"
} }
def canonicalVersionCode = 383 def canonicalVersionCode = 384
def canonicalVersionName = "1.20.1" def canonicalVersionName = "1.20.2"
def postFixSize = 10 def postFixSize = 10
def abiPostFix = ['armeabi-v7a' : 1, def abiPostFix = ['armeabi-v7a' : 1,

6
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt
View File

@ -37,11 +37,7 @@ class DownloadDialog(private val recipient: Recipient) : DialogFragment() {
val explanation = Phrase.from(context, R.string.attachmentsAutoDownloadModalDescription) val explanation = Phrase.from(context, R.string.attachmentsAutoDownloadModalDescription)
.put(CONVERSATION_NAME_KEY, recipient.toShortString()) .put(CONVERSATION_NAME_KEY, recipient.toShortString())
.format() .format()
val spannable = SpannableStringBuilder(explanation) text(explanation)
val startIndex = explanation.indexOf(name)
spannable.setSpan(StyleSpan(Typeface.BOLD), startIndex, startIndex + name.count(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
text(spannable)
button(R.string.download, R.string.AccessibilityId_download) { trust() } button(R.string.download, R.string.AccessibilityId_download) { trust() }
cancelButton { dismiss() } cancelButton { dismiss() }

5
app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
View File

@ -1582,8 +1582,11 @@ open class Storage(
DatabaseComponent.get(context).recipientDatabase().setApproved(recipient, approved) DatabaseComponent.get(context).recipientDatabase().setApproved(recipient, approved)
if (recipient.isLocalNumber || !recipient.isContactRecipient) return if (recipient.isLocalNumber || !recipient.isContactRecipient) return
configFactory.contacts?.upsertContact(recipient.address.serialize()) { 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.approved = approved
this.priority = PRIORITY_VISIBLE
} }
} }