diff --git a/auth/src/main/java/org/futo/circles/auth/feature/pass_phrase/restore/RestoreBackupDataSource.kt b/auth/src/main/java/org/futo/circles/auth/feature/pass_phrase/restore/RestoreBackupDataSource.kt index fcdd46dd01766e4535130bacbb3a4c3895d69e41..21c9836e3ab2912165f8d6ba37db8fd4cc78d4b6 100644 --- a/auth/src/main/java/org/futo/circles/auth/feature/pass_phrase/restore/RestoreBackupDataSource.kt +++ b/auth/src/main/java/org/futo/circles/auth/feature/pass_phrase/restore/RestoreBackupDataSource.kt @@ -14,6 +14,7 @@ import org.matrix.android.sdk.api.extensions.tryOrNull import org.matrix.android.sdk.api.listeners.StepProgressListener import org.matrix.android.sdk.api.session.crypto.keysbackup.BackupRecoveryKey import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupService +import org.matrix.android.sdk.api.session.crypto.keysbackup.extractCurveKeyFromRecoveryKey import org.matrix.android.sdk.api.session.crypto.keysbackup.toKeysVersionResult import javax.inject.Inject @@ -77,6 +78,9 @@ class RestoreBackupDataSource @Inject constructor( try { val keyData = ssssDataSource.getBsSpekeRecoveryKey(progressObserver) restoreKeysWithRecoveryKey(keyData) + extractCurveKeyFromRecoveryKey(keyData.recoveryKey)?.let { + MatrixSessionProvider.currentSession?.cryptoService()?.createDehydratedDevice(it) + } } catch (e: Throwable) { loadingLiveData.postValue(LoadingData(isLoading = false)) throw e diff --git a/core/build.gradle b/core/build.gradle index a4ba3eacb2b2283927ee7aaf93acaac58e3b54b0..b02eca0eef95068f668c0645eb0e145b23539f49 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -80,12 +80,12 @@ dependencies { kapt "com.google.dagger:hilt-compiler:$rootProject.ext.hilt_version" //Matrix release - api('org.futo.gitlab.circles:matrix-android-sdk:v1.6.10.35@aar') { - transitive = true - } +// api('org.futo.gitlab.circles:matrix-android-sdk:v1.6.10.35@aar') { +// transitive = true +// } //Matrix mavenLocal testing - //api "org.futo.gitlab.circles:matrix-android-sdk:0.1" + api "org.futo.gitlab.circles:matrix-android-sdk:0.1.7" //Retrofit2 def retrofit_version = '2.11.0'