mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-24 02:15:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Allow returning a value from an async transaction

Browse source
This commit is contained in:
ganfra 2019-12-05 17:14:38 +01:00
parent fb8ba32fb4
commit aa9d66b991
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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 kotlinx.coroutines.withContext
import timber.log.Timber 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 -> Realm.getInstance(config).use { bgRealm ->
bgRealm.beginTransaction() bgRealm.beginTransaction()
val result: T
try { try {
val start = System.currentTimeMillis() val start = System.currentTimeMillis()
transaction(bgRealm) result = transaction(bgRealm)
if (isActive) { if (isActive) {
bgRealm.commitTransaction() bgRealm.commitTransaction()
val end = System.currentTimeMillis() val end = System.currentTimeMillis()
@ -39,5 +40,6 @@ suspend fun awaitTransaction(config: RealmConfiguration, transaction: suspend (r
bgRealm.cancelTransaction() 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 { override suspend fun getFilter(): String {
return Realm.getInstance(monarchy.realmConfiguration).use { return monarchy.awaitTransaction {
val filter = FilterEntity.getOrCreate(it) val filter = FilterEntity.getOrCreate(it)
if (filter.filterId.isBlank()) { if (filter.filterId.isBlank()) {
// Use the Json format // Use the Json format
@ -82,7 +82,7 @@ internal class DefaultFilterRepository @Inject constructor(private val monarchy:
} }
override suspend fun getRoomFilter(): String { override suspend fun getRoomFilter(): String {
return Realm.getInstance(monarchy.realmConfiguration).use { return monarchy.awaitTransaction {
FilterEntity.getOrCreate(it).roomEventFilterJson 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 io.realm.RealmModel
import java.util.concurrent.atomic.AtomicReference import java.util.concurrent.atomic.AtomicReference
internal suspend fun Monarchy.awaitTransaction(transaction: suspend (realm: Realm) -> Unit) { internal suspend fun <T> Monarchy.awaitTransaction(transaction: suspend (realm: Realm) -> T): T {
awaitTransaction(realmConfiguration, transaction) return awaitTransaction(realmConfiguration, transaction)
} }
fun <T : RealmModel> Monarchy.fetchCopied(query: (Realm) -> T?): T? { fun <T : RealmModel> Monarchy.fetchCopied(query: (Realm) -> T?): T? {