Merge branch 'master' into fix-import-binary-mime-type

This commit is contained in:
Naveen Singh 2024-12-25 17:20:44 +05:30 committed by GitHub
commit 8d306941a0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
96 changed files with 3663 additions and 226 deletions

View file

@ -71,9 +71,9 @@ class ManageBlockedKeywordsActivity : BaseSimpleActivity(), RefreshRecyclerViewL
private fun updateBlockedKeywords() {
ensureBackgroundThread {
val blockedKeywords = config.blockedKeywords
val blockedKeywords = config.blockedKeywords.sorted().toArrayList()
runOnUiThread {
ManageBlockedKeywordsAdapter(this, blockedKeywords.toArrayList(), this, binding.manageBlockedKeywordsList) {
ManageBlockedKeywordsAdapter(this, blockedKeywords, this, binding.manageBlockedKeywordsList) {
addOrEditBlockedKeyword(it as String)
}.apply {
binding.manageBlockedKeywordsList.adapter = this

View file

@ -106,7 +106,7 @@ class SettingsActivity : SimpleActivity() {
private fun setupMessagesExport() {
binding.settingsExportMessagesHolder.setOnClickListener {
ExportMessagesDialog(this) { fileName ->
saveDocument.launch(fileName)
saveDocument.launch("$fileName.json")
}
}
}