From ffbef9b2cdab8f34b14a46c0f4b3888348ef79f2 Mon Sep 17 00:00:00 2001
From: Taras Smakula <tarassmakula@gmail.com>
Date: Fri, 3 May 2024 17:08:27 +0300
Subject: [PATCH] Add on login
---
.../pass_phrase/restore/RestoreBackupDataSource.kt | 4 ++++
core/build.gradle | 8 ++++----
2 files changed, 8 insertions(+), 4 deletions(-)
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 fcdd46dd0..21c9836e3 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 a4ba3eacb..b02eca0ee 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'
--
GitLab