From 8b85efebe6d61dbf35a9819f3dc01fbf42919ea4 Mon Sep 17 00:00:00 2001
From: Taras Smakula <tarassmakula@gmail.com>
Date: Fri, 17 May 2024 14:31:43 +0300
Subject: [PATCH] Cleanup
---
.../create/CreatePassPhraseDataSource.kt | 6 ------
.../restore/RestoreBackupDataSource.kt | 3 ---
.../feature/pass_phrase/restore/SSSSDataSource.kt | 15 ---------------
.../active_sessions/ActiveSessionsDataSource.kt | 4 ++--
4 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/pass_phrase/create/CreatePassPhraseDataSource.kt b/auth/src/main/java/org/futo/circles/auth/feature/pass_phrase/create/CreatePassPhraseDataSource.kt
index 01a12aa64..56baa3c51 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/pass_phrase/create/CreatePassPhraseDataSource.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/pass_phrase/create/CreatePassPhraseDataSource.kt
@@ -1,7 +1,6 @@
package org.futo.circles.auth.feature.pass_phrase.create
import android.content.Context
-import android.util.Log
import androidx.lifecycle.MutableLiveData
import dagger.hilt.android.qualifiers.ApplicationContext
import org.futo.circles.auth.R
@@ -29,13 +28,8 @@ class CreatePassPhraseDataSource @Inject constructor(
suspend fun createPassPhraseBackup() {
loadingLiveData.postValue(LoadingData(messageId = R.string.generating_recovery_key))
val keyBackupPrivateKey = generateRandomPrivateKey()
- Log.d("MyLog", "createPassPhraseBackup random private key $keyBackupPrivateKey")
-
val backupCreationInfo =
keysBackupService.prepareKeysBackupVersion(keyBackupPrivateKey, null)
-
- Log.d("MyLog", "createPassPhraseBackup backupCreationInfo $backupCreationInfo")
-
createKeyBackup(backupCreationInfo)
val keySpec = ssssDataSource.storeBsSpekeKeyIntoSSSS(keyBackupPrivateKey)
crossSigningDataSource.initCrossSigningIfNeed(keySpec)
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 b422a3843..2ee432322 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
@@ -3,7 +3,6 @@ package org.futo.circles.auth.feature.pass_phrase.restore
import android.annotation.SuppressLint
import android.content.Context
import android.net.Uri
-import android.util.Log
import androidx.lifecycle.MutableLiveData
import dagger.hilt.android.qualifiers.ApplicationContext
import org.futo.circles.auth.R
@@ -97,8 +96,6 @@ class RestoreBackupDataSource @Inject constructor(
}
private suspend fun restoreKeysWithRecoveryKey(secretKeyData: SecretKeyData) {
-
- Log.d("MyLog", "keydata $secretKeyData")
val keysBackupService = getKeysBackupService()
try {
val keyVersion = getKeysVersion(keysBackupService)
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/pass_phrase/restore/SSSSDataSource.kt b/auth/src/main/java/org/futo/circles/auth/feature/pass_phrase/restore/SSSSDataSource.kt
index ba30e61be..11d0bcc8e 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/pass_phrase/restore/SSSSDataSource.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/pass_phrase/restore/SSSSDataSource.kt
@@ -1,6 +1,5 @@
package org.futo.circles.auth.feature.pass_phrase.restore
-import android.util.Log
import org.futo.circles.auth.bsspeke.BSSpekeClientProvider
import org.futo.circles.auth.model.SecretKeyData
import org.futo.circles.core.provider.MatrixSessionProvider
@@ -26,13 +25,8 @@ class SSSSDataSource @Inject constructor() {
val bsSpekeClient = BSSpekeClientProvider.getClientOrThrow()
val keyId = bsSpekeClient.generateKeyId()
val key = bsSpekeClient.generateHashKey()
- Log.d("MyLog", "store key $key")
-
val keyInfo = session.sharedSecretStorageService()
.generateBsSpekeKeyInfo(keyId, key, EmptyKeySigner())
-
- Log.d("MyLog", "store keyinfo $keyInfo")
-
storeSecret(session, keyBackupPrivateKey, keyInfo)
return keyInfo.keySpec
}
@@ -42,11 +36,9 @@ class SSSSDataSource @Inject constructor() {
StepProgressListener.Step.ComputingKey(0, 0)
)
val keyInfo = getKeyInfo()
- Log.d("MyLog", "key info $keyInfo")
val keySpec = RawBytesKeySpec(
BSSpekeClientProvider.getClientOrThrow().generateHashKey()
)
- Log.d("MyLog", "key spec $keySpec")
val secret = getSecret(keyInfo, keySpec)
?: throw Exception("Backup could not be decrypted with this passphrase")
@@ -120,15 +112,8 @@ class SSSSDataSource @Inject constructor() {
secretBase64 = keyBackupPrivateKey.toBase64NoPadding(),
keys = listOf(KeyRef(keyInfo.keyId, keyInfo.keySpec))
)
-
- Log.d(
- "MyLog",
- "storeSecret secretBase64 ${keyBackupPrivateKey.toBase64NoPadding()}, key info $keyInfo"
- )
-
session.cryptoService().keysBackupService()
.onSecretKeyGossip(keyBackupPrivateKey.toBase64NoPadding())
- Log.d("MyLog", "onSecretKeyGossip secretBase64 ${keyBackupPrivateKey.toBase64NoPadding()}")
session.sharedSecretStorageService().setDefaultKey(keyInfo.keyId)
}
diff --git a/settings/src/main/java/org/futo/circles/settings/feature/active_sessions/ActiveSessionsDataSource.kt b/settings/src/main/java/org/futo/circles/settings/feature/active_sessions/ActiveSessionsDataSource.kt
index 55a4b4dd6..f3f8a057a 100644
--- a/settings/src/main/java/org/futo/circles/settings/feature/active_sessions/ActiveSessionsDataSource.kt
+++ b/settings/src/main/java/org/futo/circles/settings/feature/active_sessions/ActiveSessionsDataSource.kt
@@ -74,14 +74,14 @@ class ActiveSessionsDataSource @Inject constructor(
if (otherSessions.isNotEmpty()) {
sessionsList.add(SessionHeader(context.getString(R.string.other_sessions)))
sessionsList.addAll(otherSessions.mapNotNull {
- // if (!it.isDehydrated) {
+ if (!it.isDehydrated) {
ActiveSession(
cryptoDeviceInfo = it,
canVerify = isCurrentSessionVerified && it.trustLevel?.isCrossSigningVerified() != true,
isResetKeysVisible = false,
isOptionsVisible = sessionsWithVisibleOptions.contains(it.deviceId)
)
- //} else null
+ } else null
}
)
}
--
GitLab