Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-20 00:29:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated SVR2 enclaves.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-02-28 13:01:52 -05:00
committed by Alex Hart
parent 86afa988a0
commit 78d30fc479
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/pin/SvrRepository.kt
View File

@@ -39,11 +39,10 @@ object SvrRepository {
val TAG = Log.tag(SvrRepository::class.java)
private val svr2Deprecated: SecureValueRecovery = ApplicationDependencies.getSignalServiceAccountManager().getSecureValueRecoveryV2(BuildConfig.SVR2_MRENCLAVE_DEPRECATED)
private val svr2: SecureValueRecovery = ApplicationDependencies.getSignalServiceAccountManager().getSecureValueRecoveryV2(BuildConfig.SVR2_MRENCLAVE)
/** An ordered list of SVR implementations to read from. They should be in priority order, with the most important one listed first. */
private val readImplementations: List<SecureValueRecovery> = listOf(svr2, svr2Deprecated)
private val readImplementations: List<SecureValueRecovery> = listOf(svr2)
/** An ordered list of SVR implementations to write to. They should be in priority order, with the most important one listed first. */
private val writeImplementations: List<SecureValueRecovery> = listOf(svr2)
@@ -74,8 +73,7 @@ object SvrRepository {
Log.i(TAG, "restoreMasterKeyPreRegistration()", true)
val operations: List<Pair<SecureValueRecovery, () -> RestoreResponse>> = listOf(
svr2 to { restoreMasterKeyPreRegistration(svr2, credentials.svr2, userPin) },
svr2Deprecated to { restoreMasterKeyPreRegistration(svr2Deprecated, credentials.svr2, userPin) }
svr2 to { restoreMasterKeyPreRegistration(svr2, credentials.svr2, userPin) }
)
for ((implementation, operation) in operations) {