Start mirroring to SVR2.

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt

@@ -28,9 +28,9 @@ import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.contactshare.SimpleTextWatcher
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.lock.v2.CreateKbsPinActivity
-import org.thoughtcrime.securesms.lock.v2.KbsConstants
+import org.thoughtcrime.securesms.lock.v2.CreateSvrPinActivity
 import org.thoughtcrime.securesms.lock.v2.PinKeyboardType
+import org.thoughtcrime.securesms.lock.v2.SvrConstants
 import org.thoughtcrime.securesms.pin.RegistrationLockV2Dialog
 import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity
 import org.thoughtcrime.securesms.util.PlayStoreUtil
@@ -45,7 +45,7 @@ class AccountSettingsFragment : DSLSettingsFragment(R.string.AccountSettingsFrag
   lateinit var viewModel: AccountSettingsViewModel
 
   override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-    if (requestCode == CreateKbsPinActivity.REQUEST_NEW_PIN && resultCode == CreateKbsPinActivity.RESULT_OK) {
+    if (requestCode == CreateSvrPinActivity.REQUEST_NEW_PIN && resultCode == CreateSvrPinActivity.RESULT_OK) {
       Snackbar.make(requireView(), R.string.ConfirmKbsPinFragment__pin_created, Snackbar.LENGTH_LONG).show()
     }
   }
@@ -73,9 +73,9 @@ class AccountSettingsFragment : DSLSettingsFragment(R.string.AccountSettingsFrag
         isEnabled = state.isDeprecatedOrUnregistered(),
         onClick = {
           if (state.hasPin) {
-            startActivityForResult(CreateKbsPinActivity.getIntentForPinChangeFromSettings(requireContext()), CreateKbsPinActivity.REQUEST_NEW_PIN)
+            startActivityForResult(CreateSvrPinActivity.getIntentForPinChangeFromSettings(requireContext()), CreateSvrPinActivity.REQUEST_NEW_PIN)
           } else {
-            startActivityForResult(CreateKbsPinActivity.getIntentForPinCreate(requireContext()), CreateKbsPinActivity.REQUEST_NEW_PIN)
+            startActivityForResult(CreateSvrPinActivity.getIntentForPinCreate(requireContext()), CreateSvrPinActivity.REQUEST_NEW_PIN)
           }
         }
       )
@@ -240,14 +240,14 @@ class AccountSettingsFragment : DSLSettingsFragment(R.string.AccountSettingsFrag
 
       pinEditText.addTextChangedListener(object : SimpleTextWatcher() {
         override fun onTextChanged(text: String) {
-          turnOffButton.isEnabled = text.length >= KbsConstants.MINIMUM_PIN_LENGTH
+          turnOffButton.isEnabled = text.length >= SvrConstants.MINIMUM_PIN_LENGTH
         }
       })
 
       pinEditText.typeface = Typeface.DEFAULT
       turnOffButton.setOnClickListener {
         val pin = pinEditText.text.toString()
-        val correct = PinHashUtil.verifyLocalPinHash(SignalStore.kbsValues().localPinHash!!, pin)
+        val correct = PinHashUtil.verifyLocalPinHash(SignalStore.svr().localPinHash!!, pin)
         if (correct) {
           SignalStore.pinValues().setPinRemindersEnabled(false)
           viewModel.refreshState()

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsViewModel.kt

@@ -18,9 +18,9 @@ class AccountSettingsViewModel : ViewModel() {
 
   private fun getCurrentState(): AccountSettingsState {
     return AccountSettingsState(
-      hasPin = SignalStore.kbsValues().hasPin() && !SignalStore.kbsValues().hasOptedOut(),
+      hasPin = SignalStore.svr().hasPin() && !SignalStore.svr().hasOptedOut(),
       pinRemindersEnabled = SignalStore.pinValues().arePinRemindersEnabled(),
-      registrationLockEnabled = SignalStore.kbsValues().isV2RegistrationLockEnabled,
+      registrationLockEnabled = SignalStore.svr().isRegistrationLockEnabled,
       userUnregistered = TextSecurePreferences.isUnauthorizedReceived(ApplicationDependencies.getApplication()),
       clientDeprecated = SignalStore.misc().isClientDeprecated
     )

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberPinDiffersFragment.kt

@@ -8,7 +8,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.thoughtcrime.securesms.LoggingFragment
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberUtil.changeNumberSuccess
-import org.thoughtcrime.securesms.lock.v2.CreateKbsPinActivity
+import org.thoughtcrime.securesms.lock.v2.CreateSvrPinActivity
 
 class ChangeNumberPinDiffersFragment : LoggingFragment(R.layout.fragment_change_number_pin_differs) {
 
@@ -18,13 +18,13 @@ class ChangeNumberPinDiffersFragment : LoggingFragment(R.layout.fragment_change_
     }
 
     val changePin = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-      if (result.resultCode == CreateKbsPinActivity.RESULT_OK) {
+      if (result.resultCode == CreateSvrPinActivity.RESULT_OK) {
         changeNumberSuccess()
       }
     }
 
     view.findViewById<View>(R.id.change_number_pin_differs_update_pin).setOnClickListener {
-      changePin.launch(CreateKbsPinActivity.getIntentForPinChangeFromSettings(requireContext()))
+      changePin.launch(CreateSvrPinActivity.getIntentForPinChangeFromSettings(requireContext()))
     }
 
     requireActivity().onBackPressedDispatcher.addCallback(

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRegistrationLockFragment.kt

@@ -42,7 +42,7 @@ class ChangeNumberRegistrationLockFragment : BaseRegistrationLockFragment(R.layo
   }
 
   override fun handleSuccessfulPinEntry(pin: String) {
-    val pinsDiffer: Boolean = SignalStore.kbsValues().localPinHash?.let { !PinHashUtil.verifyLocalPinHash(it, pin) } ?: false
+    val pinsDiffer: Boolean = SignalStore.svr().localPinHash?.let { !PinHashUtil.verifyLocalPinHash(it, pin) } ?: false
 
     pinButton.cancelSpinning()
 

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt

@@ -22,18 +22,18 @@ import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.jobs.RefreshAttributesJob
 import org.thoughtcrime.securesms.keyvalue.CertificateType
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.pin.KbsRepository
-import org.thoughtcrime.securesms.pin.KeyBackupSystemWrongPinException
-import org.thoughtcrime.securesms.pin.TokenData
+import org.thoughtcrime.securesms.pin.SvrRepository
+import org.thoughtcrime.securesms.pin.SvrWrongPinException
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.registration.VerifyResponse
+import org.thoughtcrime.securesms.registration.viewmodel.SvrAuthCredentialSet
 import org.thoughtcrime.securesms.storage.StorageSyncHelper
-import org.whispersystems.signalservice.api.KbsPinData
-import org.whispersystems.signalservice.api.KeyBackupSystemNoDataException
 import org.whispersystems.signalservice.api.SignalServiceAccountManager
 import org.whispersystems.signalservice.api.SignalServiceMessageSender
+import org.whispersystems.signalservice.api.SvrNoDataException
 import org.whispersystems.signalservice.api.account.ChangePhoneNumberRequest
 import org.whispersystems.signalservice.api.account.PreKeyUpload
+import org.whispersystems.signalservice.api.kbs.MasterKey
 import org.whispersystems.signalservice.api.push.PNI
 import org.whispersystems.signalservice.api.push.ServiceId
 import org.whispersystems.signalservice.api.push.ServiceIdType
@@ -143,7 +143,7 @@ class ChangeNumberRepository(
 
       VerifyResponse.from(
         response = changeNumberResponse,
-        kbsData = null,
+        masterKey = null,
         pin = null,
         aciPreKeyCollection = null,
         pniPreKeyCollection = null
@@ -156,18 +156,18 @@ class ChangeNumberRepository(
     sessionId: String,
     newE164: String,
     pin: String,
-    tokenData: TokenData
+    svrAuthCredentials: SvrAuthCredentialSet
   ): Single<ServiceResponse<VerifyResponse>> {
     return Single.fromCallable {
-      val kbsData: KbsPinData
+      val masterKey: MasterKey
       val registrationLock: String
 
       try {
-        kbsData = KbsRepository.restoreMasterKey(pin, tokenData.enclave, tokenData.basicAuth, tokenData.tokenResponse)!!
-        registrationLock = kbsData.masterKey.deriveRegistrationLock()
-      } catch (e: KeyBackupSystemWrongPinException) {
+        masterKey = SvrRepository.restoreMasterKeyPreRegistration(svrAuthCredentials, pin)
+        registrationLock = masterKey.deriveRegistrationLock()
+      } catch (e: SvrWrongPinException) {
         return@fromCallable ServiceResponse.forExecutionError(e)
-      } catch (e: KeyBackupSystemNoDataException) {
+      } catch (e: SvrNoDataException) {
         return@fromCallable ServiceResponse.forExecutionError(e)
       } catch (e: IOException) {
         return@fromCallable ServiceResponse.forExecutionError(e)
@@ -199,7 +199,7 @@ class ChangeNumberRepository(
 
       VerifyResponse.from(
         response = changeNumberResponse,
-        kbsData = kbsData,
+        masterKey = masterKey,
         pin = pin,
         aciPreKeyCollection = null,
         pniPreKeyCollection = null

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModel.kt

@@ -16,8 +16,6 @@ import io.reactivex.rxjava3.schedulers.Schedulers
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.pin.KbsRepository
-import org.thoughtcrime.securesms.pin.TokenData
 import org.thoughtcrime.securesms.registration.RegistrationSessionProcessor
 import org.thoughtcrime.securesms.registration.SmsRetrieverReceiver
 import org.thoughtcrime.securesms.registration.VerifyAccountRepository
@@ -27,6 +25,7 @@ import org.thoughtcrime.securesms.registration.VerifyResponseWithRegistrationLoc
 import org.thoughtcrime.securesms.registration.VerifyResponseWithoutKbs
 import org.thoughtcrime.securesms.registration.viewmodel.BaseRegistrationViewModel
 import org.thoughtcrime.securesms.registration.viewmodel.NumberViewState
+import org.thoughtcrime.securesms.registration.viewmodel.SvrAuthCredentialSet
 import org.thoughtcrime.securesms.util.DefaultValueLiveData
 import org.whispersystems.signalservice.api.push.PNI
 import org.whispersystems.signalservice.api.push.exceptions.IncorrectCodeException
@@ -41,9 +40,8 @@ class ChangeNumberViewModel(
   savedState: SavedStateHandle,
   password: String,
   verifyAccountRepository: VerifyAccountRepository,
-  kbsRepository: KbsRepository,
   private val smsRetrieverReceiver: SmsRetrieverReceiver = SmsRetrieverReceiver(ApplicationDependencies.getApplication())
-) : BaseRegistrationViewModel(savedState, verifyAccountRepository, kbsRepository, password) {
+) : BaseRegistrationViewModel(savedState, verifyAccountRepository, password) {
 
   var oldNumberState: NumberViewState = NumberViewState.Builder().build()
     private set
@@ -179,9 +177,9 @@ class ChangeNumberViewModel(
       }
   }
 
-  override fun verifyAccountWithRegistrationLock(pin: String, kbsTokenData: TokenData): Single<ServiceResponse<VerifyResponse>> {
+  override fun verifyAccountWithRegistrationLock(pin: String, svrAuthCredentials: SvrAuthCredentialSet): Single<ServiceResponse<VerifyResponse>> {
     val sessionId = sessionId ?: throw IllegalStateException("No valid registration session")
-    return changeNumberRepository.changeNumber(sessionId, number.e164Number, pin, kbsTokenData)
+    return changeNumberRepository.changeNumber(sessionId, number.e164Number, pin, svrAuthCredentials)
   }
 
   @WorkerThread
@@ -199,14 +197,14 @@ class ChangeNumberViewModel(
       .map { processor }
       .onErrorReturn { t ->
         Log.w(TAG, "Error attempting to change local number", t)
-        VerifyResponseWithRegistrationLockProcessor(ServiceResponse.forUnknownError(t), processor.tokenData)
+        VerifyResponseWithRegistrationLockProcessor(ServiceResponse.forUnknownError(t), processor.svrAuthCredentials)
       }
   }
 
   fun changeNumberWithRecoveryPassword(): Single<Boolean> {
-    val recoveryPassword = SignalStore.kbsValues().recoveryPassword
+    val recoveryPassword = SignalStore.svr().recoveryPassword
 
-    return if (SignalStore.kbsValues().hasPin() && recoveryPassword != null) {
+    return if (SignalStore.svr().hasPin() && recoveryPassword != null) {
       changeNumberRepository.changeNumber(recoveryPassword = recoveryPassword, newE164 = number.e164Number)
         .map { r -> VerifyResponseWithoutKbs(r) }
         .flatMap { p ->
@@ -233,8 +231,7 @@ class ChangeNumberViewModel(
         changeNumberRepository = ChangeNumberRepository(),
         savedState = handle,
         password = password,
-        verifyAccountRepository = VerifyAccountRepository(context),
-        kbsRepository = KbsRepository()
+        verifyAccountRepository = VerifyAccountRepository(context)
       )
 
       return requireNotNull(modelClass.cast(viewModel))

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/svr/InternalSvrPlaygroundViewModel.kt

@@ -10,6 +10,7 @@ import androidx.compose.runtime.State
 import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.ViewModel
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import io.reactivex.rxjava3.schedulers.Schedulers
@@ -49,9 +50,12 @@ class InternalSvrPlaygroundViewModel : ViewModel() {
       loading = true
     )
 
-    disposables += _state.value.selected.toImplementation()
-      .setPin(_state.value.userPin, SignalStore.kbsValues().getOrCreateMasterKey())
-      .execute()
+    disposables += Single
+      .fromCallable {
+        _state.value.selected.toImplementation()
+          .setPin(_state.value.userPin, SignalStore.svr().getOrCreateMasterKey())
+          .execute()
+      }
       .subscribeOn(Schedulers.io())
       .observeOn(AndroidSchedulers.mainThread())
       .subscribe { response ->
@@ -67,8 +71,7 @@ class InternalSvrPlaygroundViewModel : ViewModel() {
       loading = true
     )
 
-    disposables += _state.value.selected.toImplementation()
-      .restoreDataPostRegistration(_state.value.userPin)
+    disposables += Single.fromCallable { _state.value.selected.toImplementation().restoreDataPostRegistration(_state.value.userPin) }
       .subscribeOn(Schedulers.io())
       .observeOn(AndroidSchedulers.mainThread())
       .subscribe { response ->
@@ -84,8 +87,7 @@ class InternalSvrPlaygroundViewModel : ViewModel() {
       loading = true
     )
 
-    disposables += _state.value.selected.toImplementation()
-      .deleteData()
+    disposables += Single.fromCallable { _state.value.selected.toImplementation().deleteData() }
       .subscribeOn(Schedulers.io())
       .observeOn(AndroidSchedulers.mainThread())
       .subscribe { response ->