Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release/1.20.2 #1689

Merged
merged 6 commits into from
Oct 13, 2024
Merged

Release/1.20.2 #1689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
231360d
Merge pull request #1683 from oxen-io/release/1.20.1
ThomasSession Oct 7, 2024
ce968cc
Only force a contact to visible if the approval goes from 'not approv…
ThomasSession Oct 10, 2024
a324cd3
Merge pull request #1687 from oxen-io/fix/ses-2802
ThomasSession Oct 10, 2024
92f66b4
Fixing store crash by removing non required spannable
ThomasSession Oct 11, 2024
2945a92
Merge pull request #1688 from oxen-io/fix/download-dialog-string
ThomasSession Oct 11, 2024
9ffaed5
v1.20.2
ThomasSession Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 1 addition & 5 deletions app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() }
Expand Down
5 changes: 4 additions & 1 deletion app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand Down