TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-11 15:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into closed_groups

Browse Source 
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt
#	libsession/src/main/java/org/session/libsession/messaging/jobs/BatchMessageReceiveJob.kt
#	libsession/src/main/java/org/session/libsession/utilities/ConfigFactoryProtocol.kt
This commit is contained in:
SessionHero01
2024-10-14 11:41:29 +11:00
parent 7175a3121c ed1bddd10b
commit 1f9b00bc0a
6 changed files with 51 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -15,8 +15,8 @@ configurations.configureEach {
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,

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

@@ -48,10 +48,7 @@ class AutoDownloadDialog(private val threadRecipient: Recipient,
val explanation = Phrase.from(context, R.string.attachmentsAutoDownloadModalDescription)
.put(CONVERSATION_NAME_KEY, displayName)
.format()
val spannable = SpannableStringBuilder(explanation)
val startIndex = explanation.indexOf(displayName)
spannable.setSpan(StyleSpan(Typeface.BOLD), startIndex, startIndex + displayName.count(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
text(spannable)
text(explanation)
button(R.string.download, R.string.AccessibilityId_download) {
setAutoDownload()

12
app/src/main/java/org/thoughtcrime/securesms/dependencies/ConfigFactory.kt
View File

@@ -329,6 +329,18 @@ class ConfigFactory @Inject constructor(
}
}
override fun getConfigTimestamp(forConfigObject: ConfigBase, publicKey: String): Long {
val variant = when (forConfigObject) {
is UserProfile -> SharedConfigMessage.Kind.USER_PROFILE.name
is Contacts -> SharedConfigMessage.Kind.CONTACTS.name
is ConversationVolatileConfig -> SharedConfigMessage.Kind.CONVO_INFO_VOLATILE.name
is UserGroupsConfig -> SharedConfigMessage.Kind.GROUPS.name
else -> throw UnsupportedOperationException("Can't support type of ${forConfigObject::class.simpleName} yet")
}
return configDatabase.retrieveConfigLastUpdateTimestamp(variant, publicKey)
}
override fun conversationInConfig(
publicKey: String?,
groupPublicKey: String?,