forked from upstream-mirrors/quik
Merge branch 'master' into upgrade-smsmms-group-individual-send-no-wait-appear-delayed-mms-mms-receive-to-worker-send-ack-mmsc
This commit is contained in:
@@ -318,23 +318,22 @@ class ConversationRepositoryImpl @Inject constructor(
|
||||
.equalTo("id", recipientId)
|
||||
.findFirst()
|
||||
|
||||
override fun getOrCreateConversation(threadId: Long, sendAsGroup: Boolean) =
|
||||
getConversation(threadId) ?: createConversation(threadId, sendAsGroup)
|
||||
|
||||
override fun createConversation(threadId: Long, sendAsGroup: Boolean) =
|
||||
createConversationFromCp(threadId, sendAsGroup)
|
||||
|
||||
override fun getConversation(addresses: Collection<String>) =
|
||||
Realm.getDefaultInstance().let { realm ->
|
||||
|
||||
override fun getConversation(recipients: Collection<String>): Conversation? =
|
||||
Realm.getDefaultInstance().use { realm ->
|
||||
realm.refresh()
|
||||
realm.where(Conversation::class.java)
|
||||
.findAll()
|
||||
.filter { conversation -> conversation.recipients.size == addresses.size }
|
||||
.filter { conversation -> conversation.recipients.size == recipients.size }
|
||||
.find { conversation ->
|
||||
conversation.recipients.map { it.address }.all { recipientAddress ->
|
||||
addresses.any { phoneNumberUtils.compare(it, recipientAddress) }
|
||||
recipients.any { phoneNumberUtils.compare(it, recipientAddress) }
|
||||
}
|
||||
}
|
||||
?.let { realm.copyFromRealm(it) }
|
||||
}
|
||||
|
||||
override fun createConversation(addresses: Collection<String>, sendAsGroup: Boolean) =
|
||||
@@ -342,6 +341,9 @@ class ConversationRepositoryImpl @Inject constructor(
|
||||
.takeIf { it != 0L }
|
||||
?.let { providerThreadId -> createConversationFromCp(providerThreadId, sendAsGroup) }
|
||||
|
||||
override fun getOrCreateConversation(threadId: Long, sendAsGroup: Boolean) =
|
||||
getConversation(threadId) ?: createConversation(threadId, sendAsGroup)
|
||||
|
||||
override fun getOrCreateConversation(addresses: Collection<String>, sendAsGroup: Boolean) =
|
||||
getConversation(addresses) ?: createConversation(addresses, sendAsGroup)
|
||||
|
||||
|
||||
@@ -62,10 +62,10 @@ class MessageContentFilterRepositoryImpl @Inject constructor() : MessageContentF
|
||||
} else if (filter.isRegex) {
|
||||
Regex(filter.value).matches(messageBody)
|
||||
} else if (filter.caseSensitive) {
|
||||
val regexp = ".*\\b" + Regex.escape(filter.value) + "\\b.*"
|
||||
val regexp = "[\\s\\S]*\\b" + Regex.escape(filter.value) + "\\b[\\s\\S]*"
|
||||
Regex(regexp).matches(messageBody)
|
||||
} else {
|
||||
val regexp = ".*\\b" + Regex.escape(filter.value.lowercase()) + "\\b.*"
|
||||
val regexp = "[\\s\\S]*\\b" + Regex.escape(filter.value.lowercase()) + "\\b[\\s\\S]*"
|
||||
Regex(regexp).matches(messageBody.lowercase())
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user