Adapt change number flow to use V2 API.

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

@@ -45,7 +45,7 @@ class ChangeNumberConfirmFragment : LoggingFragment(R.layout.fragment_change_num
 
       task.addOnSuccessListener {
         Log.i(TAG, "Successfully registered SMS listener.")
-        navigateToVerify()
+        navigateToVerify(smsListenerEnabled = true)
       }
 
       task.addOnFailureListener { e ->
@@ -57,8 +57,8 @@ class ChangeNumberConfirmFragment : LoggingFragment(R.layout.fragment_change_num
     }
   }
 
-  private fun navigateToVerify() {
-    findNavController().safeNavigate(R.id.action_changePhoneNumberConfirmFragment_to_changePhoneNumberVerifyFragment)
+  private fun navigateToVerify(smsListenerEnabled: Boolean = false) {
+    findNavController().safeNavigate(R.id.action_changePhoneNumberConfirmFragment_to_changePhoneNumberVerifyFragment, ChangeNumberVerifyFragmentArgs.Builder().setSmsListenerEnabled(smsListenerEnabled).build().toBundle())
   }
 
   companion object {

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

@@ -37,6 +37,7 @@ import org.whispersystems.signalservice.api.push.SignalServiceAddress
 import org.whispersystems.signalservice.api.push.SignedPreKeyEntity
 import org.whispersystems.signalservice.internal.ServiceResponse
 import org.whispersystems.signalservice.internal.push.OutgoingPushMessage
+import org.whispersystems.signalservice.internal.push.RegistrationSessionMetadataResponse
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos.SyncMessage
 import org.whispersystems.signalservice.internal.push.VerifyAccountResponse
 import org.whispersystems.signalservice.internal.push.WhoAmIResponse
@@ -94,7 +95,7 @@ class ChangeNumberRepository(
       .timeout(15, TimeUnit.SECONDS)
   }
 
-  fun changeNumber(code: String, newE164: String, pniUpdateMode: Boolean = false): Single<ServiceResponse<VerifyResponse>> {
+  fun changeNumber(sessionId: String, newE164: String, pniUpdateMode: Boolean = false): Single<ServiceResponse<VerifyResponse>> {
     return Single.fromCallable {
       var completed = false
       var attempts = 0
@@ -102,7 +103,7 @@ class ChangeNumberRepository(
 
       while (!completed && attempts < 5) {
         val (request: ChangePhoneNumberRequest, metadata: PendingChangeNumberMetadata) = createChangeNumberRequest(
-          code = code,
+          sessionId = sessionId,
           newE164 = newE164,
           registrationLock = null,
           pniUpdateMode = pniUpdateMode
@@ -127,7 +128,7 @@ class ChangeNumberRepository(
   }
 
   fun changeNumber(
-    code: String,
+    sessionId: String,
     newE164: String,
     pin: String,
     tokenData: TokenData
@@ -153,7 +154,7 @@ class ChangeNumberRepository(
 
       while (!completed && attempts < 5) {
         val (request: ChangePhoneNumberRequest, metadata: PendingChangeNumberMetadata) = createChangeNumberRequest(
-          code = code,
+          sessionId = sessionId,
           newE164 = newE164,
           registrationLock = registrationLock,
           pniUpdateMode = false
@@ -280,7 +281,7 @@ class ChangeNumberRepository(
   @Suppress("UsePropertyAccessSyntax")
   @WorkerThread
   private fun createChangeNumberRequest(
-    code: String,
+    sessionId: String,
     newE164: String,
     registrationLock: String?,
     pniUpdateMode: Boolean
@@ -336,8 +337,9 @@ class ChangeNumberRepository(
       }
 
     val request = ChangePhoneNumberRequest(
+      sessionId,
+      null,
       newE164,
-      code,
       registrationLock,
       pniIdentity.publicKey,
       deviceMessages,
@@ -355,5 +357,11 @@ class ChangeNumberRepository(
     return ChangeNumberRequestData(request, metadata)
   }
 
+  fun verifyAccount(sessionId: String, code: String): Single<ServiceResponse<RegistrationSessionMetadataResponse>> {
+    return Single.fromCallable {
+      accountManager.verifyAccount(code, sessionId)
+    }.subscribeOn(Schedulers.io())
+  }
+
   data class ChangeNumberRequestData(val changeNumberRequest: ChangePhoneNumberRequest, val pendingChangeNumberMetadata: PendingChangeNumberMetadata)
 }

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

@@ -49,11 +49,12 @@ class ChangeNumberVerifyFragment : LoggingFragment(R.layout.fragment_change_phon
   }
 
   private fun requestCode() {
+    val mode = if (ChangeNumberVerifyFragmentArgs.fromBundle(requireArguments()).smsListenerEnabled) VerifyAccountRepository.Mode.SMS_WITH_LISTENER else VerifyAccountRepository.Mode.SMS_WITHOUT_LISTENER
     val mccMncProducer = MccMncProducer(requireContext())
     lifecycleDisposable += viewModel
       .ensureDecryptionsDrained()
       .onErrorComplete()
-      .andThen(viewModel.requestVerificationCode(VerifyAccountRepository.Mode.SMS_WITHOUT_LISTENER, mccMncProducer.mcc, mccMncProducer.mnc))
+      .andThen(viewModel.requestVerificationCode(mode, mccMncProducer.mcc, mccMncProducer.mnc))
       .observeOn(AndroidSchedulers.mainThread())
       .subscribe { processor ->
         if (processor.hasResult()) {

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

@@ -9,13 +9,16 @@ import androidx.lifecycle.ViewModel
 import androidx.savedstate.SavedStateRegistryOwner
 import com.google.i18n.phonenumbers.NumberParseException
 import com.google.i18n.phonenumbers.PhoneNumberUtil
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.core.Single
+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
 import org.thoughtcrime.securesms.registration.VerifyResponse
@@ -26,6 +29,7 @@ import org.thoughtcrime.securesms.registration.viewmodel.BaseRegistrationViewMod
 import org.thoughtcrime.securesms.registration.viewmodel.NumberViewState
 import org.thoughtcrime.securesms.util.DefaultValueLiveData
 import org.whispersystems.signalservice.api.push.PNI
+import org.whispersystems.signalservice.api.push.exceptions.IncorrectCodeException
 import org.whispersystems.signalservice.internal.ServiceResponse
 import java.util.Objects
 
@@ -152,11 +156,32 @@ class ChangeNumberViewModel(
   }
 
   override fun verifyAccountWithoutRegistrationLock(): Single<ServiceResponse<VerifyResponse>> {
-    return changeNumberRepository.changeNumber(textCodeEntered, number.e164Number)
+    val sessionId = sessionId ?: throw IllegalStateException("No valid registration session")
+
+    return changeNumberRepository.verifyAccount(sessionId, textCodeEntered)
+      .map { RegistrationSessionProcessor.RegistrationSessionProcessorForVerification(it) }
+      .observeOn(AndroidSchedulers.mainThread())
+      .doOnSuccess {
+        if (it.hasResult()) {
+          setCanSmsAtTime(it.getNextCodeViaSmsAttempt())
+          setCanCallAtTime(it.getNextCodeViaCallAttempt())
+        }
+      }
+      .observeOn(Schedulers.io())
+      .flatMap { processor ->
+        if (processor.isAlreadyVerified() || processor.hasResult() && processor.isVerified()) {
+          changeNumberRepository.changeNumber(sessionId, number.e164Number)
+        } else if (processor.error == null) {
+          Single.just<ServiceResponse<VerifyResponse>>(ServiceResponse.forApplicationError(IncorrectCodeException(), 403, null))
+        } else {
+          Single.just<ServiceResponse<VerifyResponse>>(ServiceResponse.coerceError(processor.response))
+        }
+      }
   }
 
   override fun verifyAccountWithRegistrationLock(pin: String, kbsTokenData: TokenData): Single<ServiceResponse<VerifyResponse>> {
-    return changeNumberRepository.changeNumber(textCodeEntered, number.e164Number, pin, kbsTokenData)
+    val sessionId = sessionId ?: throw IllegalStateException("No valid registration session")
+    return changeNumberRepository.changeNumber(sessionId, number.e164Number, pin, kbsTokenData)
   }
 
   @WorkerThread

app/src/main/java/org/thoughtcrime/securesms/jobs/PnpInitializeDevicesJob.kt

@@ -24,7 +24,7 @@ class PnpInitializeDevicesJob private constructor(parameters: Parameters) : Base
   companion object {
     const val KEY = "PnpInitializeDevicesJob"
     private val TAG = Log.tag(PnpInitializeDevicesJob::class.java)
-    private const val PLACEHOLDER_CODE = "123456"
+    private const val PLACEHOLDER_SESSION_ID = "123456789"
 
     @JvmStatic
     fun enqueueIfNecessary() {
@@ -88,7 +88,7 @@ class PnpInitializeDevicesJob private constructor(parameters: Parameters) : Base
       try {
         Log.i(TAG, "Calling change number with our current number to distribute PNI messages")
         changeNumberRepository
-          .changeNumber(code = PLACEHOLDER_CODE, newE164 = e164, pniUpdateMode = true)
+          .changeNumber(sessionId = PLACEHOLDER_SESSION_ID, newE164 = e164, pniUpdateMode = true)
           .map(::VerifyResponseWithoutKbs)
           .safeBlockingGet()
           .resultOrThrow