Merge pull request #1008 from radixdlt/feature/mobile-connect-optimiz…

…ed-flow

Update mobile connect flow and UI

app/src/main/AndroidManifest.xml

@@ -41,15 +41,6 @@
 
  <category android:name="android.intent.category.LAUNCHER" />
  </intent-filter>
- <intent-filter android:autoVerify="true">
- <action android:name="android.intent.action.VIEW" />
-
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
-
- <data android:scheme="https" />
- <data android:host="dr6vsuukf8610.cloudfront.net" />
- </intent-filter>
  <intent-filter>
  <action android:name="android.intent.action.VIEW" />
 

app/src/main/java/com/babylon/wallet/android/MainActivity.kt

@@ -61,7 +61,10 @@ class MainActivity : FragmentActivity() {
  super.onCreate(savedInstanceState)
  cloudBackupSyncExecutor.startPeriodicChecks(lifecycleOwner = this)
 
- intent.data?.let { viewModel.handleDeepLink(it) }
+ intent.data?.let {
+ intent.replaceExtras(Bundle())
+ viewModel.handleDeepLink(it)
+ }
  setContent {
  RadixWalletTheme {
  val isVisible by balanceVisibilityObserver.isBalanceVisible.collectAsState(initial = true)
@@ -100,7 +103,10 @@ class MainActivity : FragmentActivity() {
 
  override fun onNewIntent(intent: Intent) {
  super.onNewIntent(intent)
- intent.data?.let { viewModel.handleDeepLink(it) }
+ intent.data?.let {
+ this.intent.replaceExtras(Bundle())
+ viewModel.handleDeepLink(it)
+ }
  }
 
  private fun setSplashExitAnimation(splashScreen: SplashScreen) {

app/src/main/java/com/babylon/wallet/android/WalletApp.kt

@@ -68,26 +68,26 @@ fun WalletApp(
  mainViewModel.oneOffEvent.collect { event ->
  when (event) {
  is MainEvent.IncomingRequestEvent -> {
+ if (event.request.needVerification) {
+ navController.mobileConnect(event.request.interactionId)
+ return@collect
+ }
  when (val incomingRequest = event.request) {
  is IncomingMessage.IncomingRequest.TransactionRequest -> {
  navController.transactionReview(
- requestId = incomingRequest.interactionId.toString()
+ requestId = incomingRequest.interactionId
  )
  }
 
  is IncomingMessage.IncomingRequest.AuthorizedRequest -> {
- navController.dAppLoginAuthorized(incomingRequest.interactionId.toString())
+ navController.dAppLoginAuthorized(incomingRequest.interactionId)
  }
 
  is IncomingMessage.IncomingRequest.UnauthorizedRequest -> {
- navController.dAppLoginUnauthorized(incomingRequest.interactionId.toString())
+ navController.dAppLoginUnauthorized(incomingRequest.interactionId)
  }
  }
  }
-
- is MainEvent.MobileConnectLink -> {
- navController.mobileConnect(event.request)
- }
  }
  }
  }
@@ -177,13 +177,13 @@ fun WalletApp(
  dismissText = null
  )
  }
- if (!state.isProfileInitialized) {
+ if (state.showMobileConnectWarning) {
  BasicPromptAlertDialog(
  finish = {
- onCloseApp()
+ mainViewModel.onMobileConnectWarningShown()
  },
- titleText = "No profile found",
- messageText = "You need to create a profile to respond to dApp requests",
+ titleText = stringResource(id = R.string.mobileConnect_noProfileDialog_title),
+ messageText = stringResource(id = R.string.mobileConnect_noProfileDialog_subtitle),
  confirmText = stringResource(id = R.string.common_ok),
  dismissText = null
  )

app/src/main/java/com/babylon/wallet/android/data/dapp/IncomingRequestRepository.kt

@@ -1,6 +1,8 @@
 package com.babylon.wallet.android.data.dapp
 
 import com.babylon.wallet.android.domain.model.IncomingMessage.IncomingRequest
+import com.babylon.wallet.android.utils.AppEvent
+import com.babylon.wallet.android.utils.AppEventBus
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asSharedFlow
@@ -17,24 +19,31 @@ interface IncomingRequestRepository {
 
  suspend fun add(incomingRequest: IncomingRequest)
 
+ suspend fun addPriorityRequest(incomingRequest: IncomingRequest)
+
  suspend fun requestHandled(requestId: String)
 
  suspend fun pauseIncomingRequests()
 
  suspend fun resumeIncomingRequests()
 
- fun getUnauthorizedRequest(requestId: String): IncomingRequest.UnauthorizedRequest?
-
- fun getTransactionWriteRequest(requestId: String): IncomingRequest.TransactionRequest?
-
- fun getAuthorizedRequest(requestId: String): IncomingRequest.AuthorizedRequest?
+ fun getRequest(requestId: String): IncomingRequest?
 
  fun removeAll()
 
  fun getAmountOfRequests(): Int
+
+ suspend fun requestDeferred(requestId: String)
+
+ fun consumeBufferedRequest(): IncomingRequest?
+
+ fun setBufferedRequest(request: IncomingRequest)
 }
 
-class IncomingRequestRepositoryImpl @Inject constructor() : IncomingRequestRepository {
+@Suppress("TooManyFunctions")
+class IncomingRequestRepositoryImpl @Inject constructor(
+ private val appEventBus: AppEventBus
+) : IncomingRequestRepository {
 
  private val requestQueue = LinkedList<QueueItem>()
 
@@ -52,6 +61,19 @@ class IncomingRequestRepositoryImpl @Inject constructor() : IncomingRequestRepos
 
  private val mutex = Mutex()
 
+ /**
+ * Request that can come in via deep link before wallet is setup.
+ */
+ private var bufferedRequest: IncomingRequest? = null
+
+ override fun setBufferedRequest(request: IncomingRequest) {
+ bufferedRequest = request
+ }
+
+ override fun consumeBufferedRequest(): IncomingRequest? {
+ return bufferedRequest?.also { bufferedRequest = null }
+ }
+
  override suspend fun add(incomingRequest: IncomingRequest) {
  mutex.withLock {
  val requestItem = QueueItem.RequestItem(incomingRequest)
@@ -68,25 +90,71 @@ class IncomingRequestRepositoryImpl @Inject constructor() : IncomingRequestRepos
  }
  }
 
+ /**
+ * There are two path of execution when using this method:
+ * - there is high priority screen in the queue, so the incoming request is added below it,
+ * taking priority over requests currently in the queue
+ * - there is no high priority screen: request is added at the top of queue and if there other request currently handled,
+ * we send a defer event for it so that UI can react and defer handling, without removing it from the queue.
+ * Deferred request will be handled again when top priority one handling completes
+ */
+ override suspend fun addPriorityRequest(incomingRequest: IncomingRequest) {
+ mutex.withLock {
+ requestQueue.addFirst(QueueItem.RequestItem(incomingRequest))
+ val currentRequest = _currentRequestToHandle.value
+ val handlingPaused = requestQueue.contains(QueueItem.HighPriorityScreen)
+ when {
+ currentRequest != null -> {
+ Timber.d("🗂 Deferring request with id ${currentRequest.interactionId}")
+ appEventBus.sendEvent(AppEvent.DeferRequestHandling(currentRequest.interactionId))
+ }
+
+ else -> {
+ if (!handlingPaused) {
+ handleNextRequest()
+ }
+ }
+ }
+ }
+ }
+
  override suspend fun requestHandled(requestId: String) {
  mutex.withLock {
- requestQueue.removeIf { it is QueueItem.RequestItem && it.incomingRequest.interactionId.toString() == requestId }
+ requestQueue.removeIf { it is QueueItem.RequestItem && it.incomingRequest.interactionId == requestId }
+ clearCurrent(requestId)
  handleNextRequest()
  Timber.d("🗂 request $requestId handled so size of list is now: ${getAmountOfRequests()}")
  }
  }
 
+ override suspend fun requestDeferred(requestId: String) {
+ mutex.withLock {
+ clearCurrent(requestId)
+ handleNextRequest()
+ Timber.d("🗂 request $requestId handled so size of list is now: ${getAmountOfRequests()}")
+ }
+ }
+
+ private suspend fun clearCurrent(requestId: String) {
+ if (_currentRequestToHandle.value?.interactionId == requestId) {
+ _currentRequestToHandle.emit(null)
+ }
+ }
+
  override suspend fun pauseIncomingRequests() {
  mutex.withLock {
  // If the queue knows about any high priority item, no need to add it again
  if (requestQueue.contains(QueueItem.HighPriorityScreen)) {
  return
  }
 
- // Put high priority item below any internal request
- val topQueueItem = requestQueue.peekFirst()
- if (topQueueItem is QueueItem.RequestItem && topQueueItem.incomingRequest.isInternal) {
- requestQueue.add(1, QueueItem.HighPriorityScreen)
+ // Put high priority item below any internal request and mobile connect requests
+ val index = requestQueue.indexOfFirst {
+ val item = it as? QueueItem.RequestItem
+ item != null && !item.incomingRequest.isInternal && !item.incomingRequest.isMobileConnectRequest
+ }
+ if (index != -1) {
+ requestQueue.add(index, QueueItem.HighPriorityScreen)
  } else {
  requestQueue.addFirst(QueueItem.HighPriorityScreen)
  }
@@ -104,37 +172,14 @@ class IncomingRequestRepositoryImpl @Inject constructor() : IncomingRequestRepos
  }
  }
 
- override fun getUnauthorizedRequest(requestId: String): IncomingRequest.UnauthorizedRequest? {
+ override fun getRequest(requestId: String): IncomingRequest? {
  val queueItem = requestQueue.find {
- it is QueueItem.RequestItem && it.incomingRequest.interactionId.toString() == requestId &&
- it.incomingRequest is IncomingRequest.UnauthorizedRequest
+ it is QueueItem.RequestItem && it.incomingRequest.interactionId == requestId
  }
  if (queueItem == null) {
- Timber.w("Unauthorized request with id $requestId is null")
+ Timber.w("Request with id $requestId is null")
  }
- return (queueItem as? QueueItem.RequestItem)?.incomingRequest as? IncomingRequest.UnauthorizedRequest
- }
-
- override fun getTransactionWriteRequest(requestId: String): IncomingRequest.TransactionRequest? {
- val queueItem = requestQueue.find {
- it is QueueItem.RequestItem && it.incomingRequest.interactionId.toString() == requestId &&
- it.incomingRequest is IncomingRequest.TransactionRequest
- }
- if (queueItem == null) {
- Timber.w("Transaction request with id $requestId is null")
- }
- return (queueItem as? QueueItem.RequestItem)?.incomingRequest as? IncomingRequest.TransactionRequest
- }
-
- override fun getAuthorizedRequest(requestId: String): IncomingRequest.AuthorizedRequest? {
- val queueItem = requestQueue.find {
- it is QueueItem.RequestItem && it.incomingRequest.interactionId.toString() == requestId &&
- it.incomingRequest is IncomingRequest.AuthorizedRequest
- }
- if (queueItem == null) {
- Timber.w("Authorized request with id $requestId is null")
- }
- return (queueItem as? QueueItem.RequestItem)?.incomingRequest as? IncomingRequest.AuthorizedRequest
+ return (queueItem as? QueueItem.RequestItem)?.incomingRequest
  }
 
  override fun removeAll() {
@@ -149,14 +194,13 @@ class IncomingRequestRepositoryImpl @Inject constructor() : IncomingRequestRepos
  // In order to emit an incoming request, the topmost item should be
  // a. An incoming request
  // b. It should not be the same as the one being handled already
- if (nextRequest is QueueItem.RequestItem && _currentRequestToHandle.value != nextRequest) {
+ if (nextRequest is QueueItem.RequestItem && _currentRequestToHandle.value != nextRequest.incomingRequest) {
  _currentRequestToHandle.emit(nextRequest.incomingRequest)
  }
  }
 
  private sealed interface QueueItem {
  data object HighPriorityScreen : QueueItem
-
  data class RequestItem(val incomingRequest: IncomingRequest) : QueueItem
  }
 }

app/src/main/java/com/babylon/wallet/android/domain/model/IncomingMessage.kt

@@ -25,9 +25,11 @@ sealed interface IncomingMessage {
 
  val value: String
 
- data class RadixMobileConnectRemoteSession(val id: String) : RemoteEntityID {
+ data class RadixMobileConnectRemoteSession(val id: String, val originVerificationUrl: String? = null) : RemoteEntityID {
  override val value: String
  get() = id
+
+ val needOriginVerification: Boolean = originVerificationUrl != null
  }
 
  data class ConnectorId(val id: String) : RemoteEntityID {
@@ -50,6 +52,9 @@ sealed interface IncomingMessage {
  val isMobileConnectRequest: Boolean
  get() = remoteEntityId is RemoteEntityID.RadixMobileConnectRemoteSession
 
+ val needVerification: Boolean
+ get() = (remoteEntityId as? RemoteEntityID.RadixMobileConnectRemoteSession)?.needOriginVerification == true
+
  val blockUntilComplete: Boolean
  get() {
  return metadata.blockUntilCompleted

app/src/main/java/com/babylon/wallet/android/domain/usecases/VerifyDAppUseCase.kt

@@ -12,6 +12,7 @@ import com.radixdlt.sargon.AccountAddress
 import com.radixdlt.sargon.DappWalletInteractionErrorType
 import com.radixdlt.sargon.extensions.init
 import rdx.works.core.domain.DApp
+import rdx.works.core.sargon.currentGateway
 import rdx.works.core.then
 import rdx.works.profile.domain.GetProfileUseCase
 import javax.inject.Inject
@@ -24,14 +25,26 @@ class VerifyDAppUseCase @Inject constructor(
 ) {
 
  suspend operator fun invoke(request: IncomingRequest): Result<Boolean> {
+ val networkId = getProfileUseCase().currentGateway.network.id
+ if (networkId != request.metadata.networkId) {
+ respondToIncomingRequestUseCase.respondWithFailure(
+ request = request,
+ error = DappWalletInteractionErrorType.INVALID_REQUEST
+ )
+ return Result.failure(
+ RadixWalletException.DappRequestException.WrongNetwork(
+ currentNetworkId = networkId,
+ requestNetworkId = request.metadata.networkId
+ )
+ )
+ }
  val dAppDefinitionAddress = runCatching { AccountAddress.init(request.metadata.dAppDefinitionAddress) }.getOrElse {
  respondToIncomingRequestUseCase.respondWithFailure(
  request = request,
  error = DappWalletInteractionErrorType.INVALID_REQUEST
  )
  return Result.failure(RadixWalletException.DappRequestException.InvalidRequest)
  }
-
  val developerMode = getProfileUseCase().appPreferences.security.isDeveloperModeEnabled
  return if (developerMode) {
  Result.success(true)