Ensure change number operation status before returning to normal app usage.

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

@@ -2,12 +2,14 @@ package org.thoughtcrime.securesms.components.settings.app.changenumber
 
 import android.os.Bundle
 import android.view.View
+import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.widget.Toolbar
 import androidx.navigation.fragment.findNavController
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberUtil.changeNumberSuccess
 import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberUtil.getCaptchaArguments
 import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberUtil.getViewModel
+import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.registration.fragments.BaseEnterCodeFragment
 
 class ChangeNumberEnterCodeFragment : BaseEnterCodeFragment<ChangeNumberViewModel>(R.layout.fragment_change_number_enter_code) {
@@ -17,9 +19,26 @@ class ChangeNumberEnterCodeFragment : BaseEnterCodeFragment<ChangeNumberViewMode
 
     val toolbar: Toolbar = view.findViewById(R.id.toolbar)
     toolbar.title = viewModel.number.fullFormattedNumber
-    toolbar.setNavigationOnClickListener { findNavController().navigateUp() }
+    toolbar.setNavigationOnClickListener { navigateUp() }
 
     view.findViewById<View>(R.id.verify_header).setOnClickListener(null)
+
+    requireActivity().onBackPressedDispatcher.addCallback(
+      viewLifecycleOwner,
+      object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+          navigateUp()
+        }
+      }
+    )
+  }
+
+  private fun navigateUp() {
+    if (SignalStore.misc().isChangeNumberLocked) {
+      startActivity(ChangeNumberLockActivity.createIntent(requireContext()))
+    } else {
+      findNavController().navigateUp()
+    }
   }
 
   override fun getViewModel(): ChangeNumberViewModel {

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

@@ -0,0 +1,108 @@
+package org.thoughtcrime.securesms.components.settings.app.changenumber
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.kotlin.subscribeBy
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.MainActivity
+import org.thoughtcrime.securesms.PassphraseRequiredActivity
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.logsubmit.SubmitDebugLogActivity
+import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter
+import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme
+import org.thoughtcrime.securesms.util.DynamicTheme
+import org.thoughtcrime.securesms.util.LifecycleDisposable
+import org.thoughtcrime.securesms.util.TextSecurePreferences
+import java.util.Objects
+
+private val TAG: String = Log.tag(ChangeNumberLockActivity::class.java)
+
+/**
+ * A captive activity that can determine if an interrupted/erred change number request
+ * caused a disparity between the server and our locally stored number.
+ */
+class ChangeNumberLockActivity : PassphraseRequiredActivity() {
+
+  private val dynamicTheme: DynamicTheme = DynamicNoActionBarTheme()
+  private val disposables: LifecycleDisposable = LifecycleDisposable()
+  private lateinit var changeNumberRepository: ChangeNumberRepository
+
+  override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) {
+    dynamicTheme.onCreate(this)
+    disposables.bindTo(lifecycle)
+
+    setContentView(R.layout.activity_change_number_lock)
+
+    changeNumberRepository = ChangeNumberRepository(applicationContext)
+    checkWhoAmI()
+  }
+
+  override fun onResume() {
+    super.onResume()
+    dynamicTheme.onResume(this)
+  }
+
+  override fun onBackPressed() = Unit
+
+  private fun checkWhoAmI() {
+    disposables.add(
+      changeNumberRepository.whoAmI()
+        .flatMap { whoAmI ->
+          if (Objects.equals(whoAmI.number, TextSecurePreferences.getLocalNumber(this))) {
+            Log.i(TAG, "Local and remote numbers match, nothing needs to be done.")
+            Single.just(false)
+          } else {
+            Log.i(TAG, "Local (${TextSecurePreferences.getLocalNumber(this)}) and remote (${whoAmI.number}) numbers do not match, updating local.")
+            changeNumberRepository.changeLocalNumber(whoAmI.number)
+              .map { true }
+          }
+        }
+        .observeOn(AndroidSchedulers.mainThread())
+        .subscribeBy(onSuccess = { onChangeStatusConfirmed() }, onError = this::onFailedToGetChangeNumberStatus)
+    )
+  }
+
+  private fun onChangeStatusConfirmed() {
+    SignalStore.misc().unlockChangeNumber()
+
+    MaterialAlertDialogBuilder(this)
+      .setTitle(R.string.ChangeNumberLockActivity__change_status_confirmed)
+      .setMessage(getString(R.string.ChangeNumberLockActivity__your_number_has_been_confirmed_as_s, PhoneNumberFormatter.prettyPrint(TextSecurePreferences.getLocalNumber(this))))
+      .setPositiveButton(android.R.string.ok) { _, _ ->
+        startActivity(MainActivity.clearTop(this))
+        finish()
+      }
+      .setCancelable(false)
+      .show()
+  }
+
+  private fun onFailedToGetChangeNumberStatus(error: Throwable) {
+    Log.w(TAG, "Unable to determine status of change number", error)
+
+    MaterialAlertDialogBuilder(this)
+      .setTitle(R.string.ChangeNumberLockActivity__change_status_unconfirmed)
+      .setMessage(getString(R.string.ChangeNumberLockActivity__we_could_not_determine_the_status_of_your_change_number_request, error.javaClass.simpleName))
+      .setPositiveButton(R.string.ChangeNumberLockActivity__retry) { _, _ -> checkWhoAmI() }
+      .setNegativeButton(R.string.ChangeNumberLockActivity__leave) { _, _ -> finish() }
+      .setNeutralButton(R.string.ChangeNumberLockActivity__submit_debug_log) { _, _ ->
+        startActivity(Intent(this, SubmitDebugLogActivity::class.java))
+        finish()
+      }
+      .setCancelable(false)
+      .show()
+  }
+
+  companion object {
+    @JvmStatic
+    fun createIntent(context: Context): Intent {
+      return Intent(context, ChangeNumberLockActivity::class.java).apply {
+        flags = Intent.FLAG_ACTIVITY_SINGLE_TOP
+      }
+    }
+  }
+}

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

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.components.settings.app.changenumber
 
 import android.os.Bundle
 import android.view.View
+import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.widget.Toolbar
 import androidx.navigation.fragment.findNavController
 import org.thoughtcrime.securesms.R
@@ -20,7 +21,16 @@ class ChangeNumberRegistrationLockFragment : BaseRegistrationLockFragment(R.layo
     super.onViewCreated(view, savedInstanceState)
 
     val toolbar: Toolbar = view.findViewById(R.id.toolbar)
-    toolbar.setNavigationOnClickListener { findNavController().navigateUp() }
+    toolbar.setNavigationOnClickListener { navigateUp() }
+
+    requireActivity().onBackPressedDispatcher.addCallback(
+      viewLifecycleOwner,
+      object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+          navigateUp()
+        }
+      }
+    )
   }
 
   override fun getViewModel(): BaseRegistrationViewModel {
@@ -60,4 +70,12 @@ class ChangeNumberRegistrationLockFragment : BaseRegistrationLockFragment(R.layo
       body
     )
   }
+
+  private fun navigateUp() {
+    if (SignalStore.misc().isChangeNumberLocked) {
+      startActivity(ChangeNumberLockActivity.createIntent(requireContext()))
+    } else {
+      findNavController().navigateUp()
+    }
+  }
 }

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

@@ -18,6 +18,7 @@ import org.whispersystems.signalservice.api.KbsPinData
 import org.whispersystems.signalservice.api.KeyBackupSystemNoDataException
 import org.whispersystems.signalservice.internal.ServiceResponse
 import org.whispersystems.signalservice.internal.push.VerifyAccountResponse
+import org.whispersystems.signalservice.internal.push.WhoAmIResponse
 
 private val TAG: String = Log.tag(ChangeNumberRepository::class.java)
 
@@ -51,12 +52,18 @@ class ChangeNumberRepository(private val context: Context) {
     }.subscribeOn(Schedulers.io())
   }
 
+  @Suppress("UsePropertyAccessSyntax")
+  fun whoAmI(): Single<WhoAmIResponse> {
+    return Single.fromCallable { ApplicationDependencies.getSignalServiceAccountManager().getWhoAmI() }
+      .subscribeOn(Schedulers.io())
+  }
+
   @WorkerThread
   fun changeLocalNumber(e164: String): Single<Unit> {
-    TextSecurePreferences.setLocalNumber(context, e164)
-
     DatabaseFactory.getRecipientDatabase(context).updateSelfPhone(e164)
 
+    TextSecurePreferences.setLocalNumber(context, e164)
+
     ApplicationDependencies.closeConnections()
     ApplicationDependencies.getIncomingMessageObserver()
 

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

@@ -12,18 +12,21 @@ import com.google.i18n.phonenumbers.PhoneNumberUtil
 import io.reactivex.rxjava3.core.Single
 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.VerifyAccountRepository
 import org.thoughtcrime.securesms.registration.VerifyAccountResponseProcessor
 import org.thoughtcrime.securesms.registration.VerifyAccountResponseWithoutKbs
 import org.thoughtcrime.securesms.registration.VerifyCodeWithRegistrationLockResponseProcessor
+import org.thoughtcrime.securesms.registration.VerifyProcessor
 import org.thoughtcrime.securesms.registration.viewmodel.BaseRegistrationViewModel
 import org.thoughtcrime.securesms.registration.viewmodel.NumberViewState
 import org.thoughtcrime.securesms.util.DefaultValueLiveData
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.whispersystems.signalservice.internal.ServiceResponse
 import org.whispersystems.signalservice.internal.push.VerifyAccountResponse
+import java.util.Objects
 
 private val TAG: String = Log.tag(ChangeNumberViewModel::class.java)
 
@@ -104,6 +107,35 @@ class ChangeNumberViewModel(
     }
   }
 
+  override fun verifyCodeWithoutRegistrationLock(code: String): Single<VerifyAccountResponseProcessor> {
+    return super.verifyCodeWithoutRegistrationLock(code)
+      .doOnSubscribe { SignalStore.misc().lockChangeNumber() }
+      .flatMap(this::attemptToUnlockChangeNumber)
+  }
+
+  override fun verifyCodeAndRegisterAccountWithRegistrationLock(pin: String): Single<VerifyCodeWithRegistrationLockResponseProcessor> {
+    return super.verifyCodeAndRegisterAccountWithRegistrationLock(pin)
+      .doOnSubscribe { SignalStore.misc().lockChangeNumber() }
+      .flatMap(this::attemptToUnlockChangeNumber)
+  }
+
+  private fun <T : VerifyProcessor> attemptToUnlockChangeNumber(processor: T): Single<T> {
+    return if (processor.hasResult() || processor.isServerSentError()) {
+      SignalStore.misc().unlockChangeNumber()
+      Single.just(processor)
+    } else {
+      changeNumberRepository.whoAmI()
+        .map { whoAmI ->
+          if (Objects.equals(whoAmI.number, localNumber)) {
+            Log.i(TAG, "Local and remote numbers match, we can unlock.")
+            SignalStore.misc().unlockChangeNumber()
+          }
+          processor
+        }
+        .onErrorReturn { processor }
+    }
+  }
+
   override fun verifyAccountWithoutRegistrationLock(): Single<ServiceResponse<VerifyAccountResponse>> {
     return changeNumberRepository.changeNumber(textCodeEntered, number.e164Number)
   }