mobile/element-android
mobile/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-09-06 08:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #740 from vector-im/feature/hot_fix_filter

Browse source 
Feature/hot fix filter
This commit is contained in:
Benoit Marty 2019-12-05 18:14:46 +01:00 committed by GitHub
parent fb8ba32fb4 eb9775e307
commit d88edd578f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStore.kt
View file

@ -643,9 +643,10 @@ internal class RealmCryptoStore(private val realmConfiguration: RealmConfigurati
}
override fun getOutgoingRoomKeyRequestByState(states: Set<OutgoingRoomKeyRequest.RequestState>): OutgoingRoomKeyRequest? {
val statesIndex = states.map { it.ordinal }.toTypedArray()
return doRealmQueryAndCopy(realmConfiguration) {
it.where<OutgoingRoomKeyRequestEntity>()
.`in`(OutgoingRoomKeyRequestEntityFields.STATE, states.map { it.ordinal }.toTypedArray())
.`in`(OutgoingRoomKeyRequestEntityFields.STATE, statesIndex)
.findFirst()
}
?.toOutgoingRoomKeyRequest()

1
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/OutgoingRoomKeyRequestEntity.kt
View file

@ -41,6 +41,7 @@ internal open class OutgoingRoomKeyRequestEntity(
* Convert to OutgoingRoomKeyRequest
*/
fun toOutgoingRoomKeyRequest(): OutgoingRoomKeyRequest {
val cancellationTxnId = this.cancellationTxnId
return OutgoingRoomKeyRequest(
RoomKeyRequestBody().apply {
algorithm = requestBodyAlgorithm

6
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/AsyncTransaction.kt
View file

@ -22,12 +22,13 @@ import kotlinx.coroutines.isActive
import kotlinx.coroutines.withContext
import timber.log.Timber
suspend fun awaitTransaction(config: RealmConfiguration, transaction: suspend (realm: Realm) -> Unit) = withContext(Dispatchers.Default) {
suspend fun <T> awaitTransaction(config: RealmConfiguration, transaction: suspend (realm: Realm) -> T) = withContext(Dispatchers.Default) {
Realm.getInstance(config).use { bgRealm ->
bgRealm.beginTransaction()
val result: T
try {
val start = System.currentTimeMillis()
transaction(bgRealm)
result = transaction(bgRealm)
if (isActive) {
bgRealm.commitTransaction()
val end = System.currentTimeMillis()
@ -39,5 +40,6 @@ suspend fun awaitTransaction(config: RealmConfiguration, transaction: suspend (r
bgRealm.cancelTransaction()
}
}
result
}
}

4
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/DefaultFilterRepository.kt
View file

@ -69,7 +69,7 @@ internal class DefaultFilterRepository @Inject constructor(private val monarchy:
}
override suspend fun getFilter(): String {
return Realm.getInstance(monarchy.realmConfiguration).use {
return monarchy.awaitTransaction {
val filter = FilterEntity.getOrCreate(it)
if (filter.filterId.isBlank()) {
// Use the Json format
@ -82,7 +82,7 @@ internal class DefaultFilterRepository @Inject constructor(private val monarchy:
}
override suspend fun getRoomFilter(): String {
return Realm.getInstance(monarchy.realmConfiguration).use {
return monarchy.awaitTransaction {
FilterEntity.getOrCreate(it).roomEventFilterJson
}
}

4
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Monarchy.kt
View file

@ -22,8 +22,8 @@ import io.realm.Realm
import io.realm.RealmModel
import java.util.concurrent.atomic.AtomicReference
internal suspend fun Monarchy.awaitTransaction(transaction: suspend (realm: Realm) -> Unit) {
awaitTransaction(realmConfiguration, transaction)
internal suspend fun <T> Monarchy.awaitTransaction(transaction: suspend (realm: Realm) -> T): T {
return awaitTransaction(realmConfiguration, transaction)
}
fun <T : RealmModel> Monarchy.fetchCopied(query: (Realm) -> T?): T? {