filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Try to fix #4007 

Wait for Realm instance to be effectively closed before deleting Realm files
This commit is contained in:
Benoit Marty 2021-10-08 20:23:16 +02:00 committed by Benoit Marty
parent 7088e5cf54
commit 0d85299c57
1 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cleanup/CleanupSession.kt
View File

@ -18,7 +18,7 @@ package org.matrix.android.sdk.internal.session.cleanup
import io.realm.Realm import io.realm.Realm
import io.realm.RealmConfiguration import io.realm.RealmConfiguration
import org.matrix.android.sdk.BuildConfig import kotlinx.coroutines.delay
import org.matrix.android.sdk.internal.SessionManager import org.matrix.android.sdk.internal.SessionManager
import org.matrix.android.sdk.internal.auth.SessionParamsStore import org.matrix.android.sdk.internal.auth.SessionParamsStore
import org.matrix.android.sdk.internal.crypto.CryptoModule import org.matrix.android.sdk.internal.crypto.CryptoModule
@ -51,6 +51,10 @@ internal class CleanupSession @Inject constructor(
@UserMd5 private val userMd5: String @UserMd5 private val userMd5: String
) { ) {
suspend fun handle() { suspend fun handle() {
val sessionRealmCount = Realm.getGlobalInstanceCount(realmSessionConfiguration)
val cryptoRealmCount = Realm.getGlobalInstanceCount(realmCryptoConfiguration)
Timber.d("Realm instance ($sessionRealmCount - $cryptoRealmCount)")
Timber.d("Cleanup: delete session params...") Timber.d("Cleanup: delete session params...")
sessionParamsStore.delete(sessionId) sessionParamsStore.delete(sessionId)
@ -63,10 +67,6 @@ internal class CleanupSession @Inject constructor(
Timber.d("Cleanup: clear crypto data...") Timber.d("Cleanup: clear crypto data...")
clearCryptoDataTask.execute(Unit) clearCryptoDataTask.execute(Unit)
Timber.d("Cleanup: clear file system")
sessionFiles.deleteRecursively()
sessionCache.deleteRecursively()
Timber.d("Cleanup: clear the database keys") Timber.d("Cleanup: clear the database keys")
realmKeysUtils.clear(SessionModule.getKeyAlias(userMd5)) realmKeysUtils.clear(SessionModule.getKeyAlias(userMd5))
realmKeysUtils.clear(CryptoModule.getKeyAlias(userMd5)) realmKeysUtils.clear(CryptoModule.getKeyAlias(userMd5))
@ -74,14 +74,33 @@ internal class CleanupSession @Inject constructor(
Timber.d("Cleanup: release session...") Timber.d("Cleanup: release session...")
sessionManager.releaseSession(sessionId) sessionManager.releaseSession(sessionId)
// Sanity check // Wait for all the Realm instance to be released properly. Closing Realm instance is async.
if (BuildConfig.DEBUG) { // After that we can safely delete the Realm files
Realm.getGlobalInstanceCount(realmSessionConfiguration) waitRealmRelease()
.takeIf { it > 0 }
?.let { Timber.e("All realm instance for session has not been closed ($it)") } Timber.d("Cleanup: clear file system")
Realm.getGlobalInstanceCount(realmCryptoConfiguration) sessionFiles.deleteRecursively()
.takeIf { it > 0 } sessionCache.deleteRecursively()
?.let { Timber.e("All realm instance for crypto has not been closed ($it)") }
} }
private suspend fun waitRealmRelease() {
var timeToWaitMillis = MAX_TIME_TO_WAIT_MILLIS
do {
val sessionRealmCount = Realm.getGlobalInstanceCount(realmSessionConfiguration)
val cryptoRealmCount = Realm.getGlobalInstanceCount(realmCryptoConfiguration)
Timber.d("Wait for all Realm instance to be closed ($sessionRealmCount - $cryptoRealmCount)")
if (sessionRealmCount > 0 || cryptoRealmCount > 0) {
Timber.d("Waiting ${TIME_TO_WAIT_MILLIS}ms")
delay(TIME_TO_WAIT_MILLIS)
timeToWaitMillis -= TIME_TO_WAIT_MILLIS
} else {
timeToWaitMillis = 0
}
} while (timeToWaitMillis > 0)
}
companion object {
private const val MAX_TIME_TO_WAIT_MILLIS = 10_000L
private const val TIME_TO_WAIT_MILLIS = 10L
} }
} }