From 6f384c799f46fe63c55b71a3590a8b0349861bbd Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 3 Jan 2023 15:02:45 +0100 Subject: [PATCH] Batch insertion of `shouldShareHistory` --- .../internal/crypto/DefaultCryptoService.kt | 2 ++ .../internal/crypto/store/IMXCryptoStore.kt | 3 +++ .../crypto/store/db/CryptoStoreAggregator.kt | 21 +++++++++++++++ .../crypto/store/db/RealmCryptoStore.kt | 26 ++++++++++++++++--- 4 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/CryptoStoreAggregator.kt diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt index 7862da1c17..128f06eacb 100755 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt @@ -384,6 +384,7 @@ internal class DefaultCryptoService @Inject constructor( } } } + cryptoStore.onSyncWillProcess() } private fun internalStart() { @@ -432,6 +433,7 @@ internal class DefaultCryptoService @Inject constructor( * @param syncResponse the syncResponse */ fun onSyncCompleted(syncResponse: SyncResponse) { + cryptoStore.onSyncCompleted() cryptoCoroutineScope.launch(coroutineDispatchers.crypto) { runCatching { if (syncResponse.deviceLists != null) { diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt index 21e3342365..a285dbec78 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt @@ -48,6 +48,9 @@ import org.matrix.olm.OlmOutboundGroupSession */ internal interface IMXCryptoStore { + fun onSyncWillProcess() + fun onSyncCompleted() + /** * @return the device id */ diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/CryptoStoreAggregator.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/CryptoStoreAggregator.kt new file mode 100644 index 0000000000..529cad6869 --- /dev/null +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/CryptoStoreAggregator.kt @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2023 The Matrix.org Foundation C.I.C. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.matrix.android.sdk.internal.crypto.store.db + +data class CryptoStoreAggregator( + val setShouldShareHistoryData: MutableMap = mutableMapOf() +) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt index 1b52b79746..a98a7ee0ec 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt @@ -716,9 +716,7 @@ internal class RealmCryptoStore @Inject constructor( override fun setShouldShareHistory(roomId: String, shouldShareHistory: Boolean) { Timber.tag(loggerTag.value) .v("setShouldShareHistory for room $roomId is $shouldShareHistory") - doRealmTransaction(realmConfiguration) { - CryptoRoomEntity.getOrCreate(it, roomId).shouldShareHistory = shouldShareHistory - } + cryptoStoreAggregator?.setShouldShareHistoryData?.put(roomId, shouldShareHistory) } override fun storeSession(olmSessionWrapper: OlmSessionWrapper, deviceKey: String) { @@ -1815,4 +1813,26 @@ internal class RealmCryptoStore @Inject constructor( // Can we do something for WithHeldSessionEntity? } } + + private var cryptoStoreAggregator: CryptoStoreAggregator? = null + override fun onSyncWillProcess() { + if (cryptoStoreAggregator != null) { + Timber.e("cryptoStoreAggregator is not null...") + } + cryptoStoreAggregator = CryptoStoreAggregator() + } + + override fun onSyncCompleted() { + val aggregator = cryptoStoreAggregator ?: return Unit.also { + Timber.e("cryptoStoreAggregator is null...") + } + + doRealmTransaction("onSyncCompleted", realmConfiguration) { realm -> + // setShouldShareHistory + aggregator.setShouldShareHistoryData.map { + CryptoRoomEntity.getOrCreate(realm, it.key).shouldShareHistory = it.value + } + } + cryptoStoreAggregator = null + } }