rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Realm: fix upsert on other dbs

Browse Source
This commit is contained in:
ganfra 2022-08-05 19:28:31 +02:00
parent 5b91c14e71
commit 2cdd05072b
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawCacheStore.kt
View File

@ -45,6 +45,7 @@ internal class RawCacheStore @Inject constructor(
} else {
val newCacheEntity = RawCacheEntity()
.apply {
this.url = url
this.data = data
this.lastUpdatedTimestamp = timestamp
}

10
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/RealmContentScannerStore.kt
View File

@ -19,7 +19,6 @@ package org.matrix.android.sdk.internal.session.contentscanner.db
import io.realm.kotlin.TypedRealm
import io.realm.kotlin.query.RealmQuery
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.flatMapConcat
import kotlinx.coroutines.flow.map
import org.matrix.android.sdk.api.extensions.orFalse
@ -27,6 +26,7 @@ import org.matrix.android.sdk.api.session.contentscanner.ScanState
import org.matrix.android.sdk.api.session.contentscanner.ScanStatusInfo
import org.matrix.android.sdk.api.util.Optional
import org.matrix.android.sdk.internal.database.RealmInstance
import org.matrix.android.sdk.internal.database.andIf
import org.matrix.android.sdk.internal.database.await
import org.matrix.android.sdk.internal.di.ContentScannerDatabase
import org.matrix.android.sdk.internal.session.SessionScope
@ -101,6 +101,8 @@ internal class RealmContentScannerStore @Inject constructor(
operation(contentScanResultEntity)
} else {
val newContentScanResultEntity = ContentScanResultEntity().apply {
this.mediaUrl = mxcUrl
this.scannerUrl = scannerUrl
operation(this)
}
copyToRealm(newContentScanResultEntity)
@ -148,10 +150,8 @@ internal class RealmContentScannerStore @Inject constructor(
private fun TypedRealm.queryContentScanResultEntity(mxcUrl: String, scannerUrl: String?): RealmQuery<ContentScanResultEntity> {
return query(ContentScanResultEntity::class, "mediaUrl == $0", mxcUrl)
.apply {
if (scannerUrl != null) {
query("scannerUrl == $0", scannerUrl)
}
.andIf(scannerUrl != null) {
query("scannerUrl == $0", scannerUrl)
}
}