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

crypto: Correctly continue backing up room keys

Browse Source
This commit is contained in:
Damir Jelić 2021-11-03 12:17:10 +01:00
parent 2b8783b489
commit f9476f12af
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/RustKeyBackupService.kt
View File

@ -812,7 +812,7 @@ internal class RustKeyBackupService @Inject constructor(
* Send a chunk of keys to backup * Send a chunk of keys to backup
*/ */
@UiThread @UiThread
private suspend fun backupKeys() { private suspend fun backupKeys(forceRecheck: Boolean = false) {
Timber.v("backupKeys") Timber.v("backupKeys")
// Sanity check, as this method can be called after a delay, the state may have change during the delay // Sanity check, as this method can be called after a delay, the state may have change during the delay
@ -824,7 +824,7 @@ internal class RustKeyBackupService @Inject constructor(
return return
} }
if (state === KeysBackupState.BackingUp) { if (state === KeysBackupState.BackingUp && !forceRecheck) {
// Do nothing if we are already backing up // Do nothing if we are already backing up
Timber.v("backupKeys: Invalid state: $state") Timber.v("backupKeys: Invalid state: $state")
return return
@ -856,7 +856,7 @@ internal class RustKeyBackupService @Inject constructor(
// TODO, again is this correct? // TODO, again is this correct?
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {
backupKeys() backupKeys(true)
} }
} else { } else {
// Can't happen, do we want to panic? // Can't happen, do we want to panic?