Merge pull request #428 from code-payments/fix/handle-remote-send-confirmation-timeout

bmc08gt · web-flow · commit a098902745c4 · 2024-05-30T14:01:16.000-04:00
Fix/handle remote send confirmation timeout
diff --git a/api/src/main/java/com/getcode/network/repository/SendTransactionRepository.kt b/api/src/main/java/com/getcode/network/repository/SendTransactionRepository.kt
@@ -1,15 +1,18 @@
 package com.getcode.network.repository
 
-import android.content.Context
-import com.getcode.ed25519.Ed25519
 import com.getcode.analytics.AnalyticsService
+import com.getcode.ed25519.Ed25519
+import com.getcode.model.CodePayload
+import com.getcode.model.IntentMetadata
+import com.getcode.model.Kin
+import com.getcode.model.KinAmount
+import com.getcode.model.Kind
+import com.getcode.network.client.Client
+import com.getcode.network.client.pollIntentMetadata
+import com.getcode.network.client.transfer
 import com.getcode.solana.keys.PublicKey
-import com.getcode.model.*
-import com.getcode.network.client.*
 import com.getcode.solana.organizer.Organizer
-import com.getcode.utils.ErrorUtils
 import com.getcode.utils.nonce
-import dagger.hilt.android.qualifiers.ApplicationContext
 import io.reactivex.rxjava3.core.Flowable
 import kotlinx.coroutines.rx3.asFlowable
 import javax.inject.Inject
@@ -21,15 +24,17 @@ class SendTransactionRepository @Inject constructor(
     private val client: Client,
 ) {
     private lateinit var amount: KinAmount
+    private lateinit var organizer: Organizer
     private lateinit var owner: Ed25519.KeyPair
     private lateinit var payload: CodePayload
     lateinit var payloadData: List<Byte>
 
     private lateinit var rendezvousKey: Ed25519.KeyPair
     private var receivingAccount: PublicKey? = null
 
-    fun init(amount: KinAmount, owner: Ed25519.KeyPair) {
+    fun init(amount: KinAmount, organizer: Organizer, owner: Ed25519.KeyPair) {
         this.amount = amount
+        this.organizer = organizer
         this.owner = owner
 
         this.payload = CodePayload(
@@ -43,7 +48,7 @@ class SendTransactionRepository @Inject constructor(
         this.receivingAccount = null
     }
 
-    fun startTransaction(organizer: Organizer): Flowable<IntentMetadata> {
+    fun startTransaction(): Flowable<IntentMetadata> {
         return messagingRepository.openMessageStream(rendezvousKey)
             .firstOrError()
             .flatMapPublisher { paymentRequest ->
diff --git a/app/src/main/java/com/getcode/ui/components/BottomBarContainer.kt b/app/src/main/java/com/getcode/ui/components/BottomBarContainer.kt
@@ -1,59 +1,79 @@
 package com.getcode.ui.components
 
-import androidx.compose.animation.*
+import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.MutableTransitionState
 import androidx.compose.animation.core.tween
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.runtime.*
-import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableLongStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import com.getcode.CodeAppState
 import com.getcode.manager.BottomBarManager
 import com.getcode.ui.utils.rememberedClickable
-import java.util.*
-import kotlin.concurrent.timerTask
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 
 @Composable
 fun BottomBarContainer(appState: CodeAppState) {
+    val scope = rememberCoroutineScope()
     val bottomBarMessage by appState.bottomBarMessage.collectAsState()
-    val bottomBarVisibleState = remember { MutableTransitionState(false) }
+    val bottomBarVisibleState = remember(bottomBarMessage?.id) { MutableTransitionState(false) }
     var bottomBarMessageDismissId by remember { mutableLongStateOf(0L) }
-    val onClose: (bottomBarActionType: BottomBarManager.BottomBarActionType?) -> Unit = {
+    val onClose: suspend (bottomBarActionType: BottomBarManager.BottomBarActionType?) -> Unit = {
         bottomBarMessageDismissId = bottomBarMessage?.id ?: 0
         bottomBarVisibleState.targetState = false
-
         bottomBarMessage?.onClose?.invoke(it)
 
-        Timer().schedule(timerTask {
-            BottomBarManager.setMessageShown(bottomBarMessageDismissId)
-        }, 100)
-    }
-    val onBackPressed = {
-        if (bottomBarMessage?.isDismissible == true) onClose(null)
+        delay(100)
+        BottomBarManager.setMessageShown(bottomBarMessageDismissId)
     }
 
-    if (!bottomBarVisibleState.targetState && !bottomBarVisibleState.currentState) {
-        Timer().schedule(timerTask {
+    // handle changes in visible state
+    LaunchedEffect(bottomBarVisibleState) {
+        if (!bottomBarVisibleState.targetState && !bottomBarVisibleState.currentState) {
+            delay(50)
             bottomBarVisibleState.targetState = bottomBarMessage != null
-        }, 50)
 
-        if (bottomBarMessageDismissId == bottomBarMessage?.id) {
+            if (bottomBarMessageDismissId == bottomBarMessage?.id) {
+                bottomBarMessageDismissId = 0
+            }
+        }
+    }
+
+    // handle provided timeout duration; triggering onClose with no action
+    LaunchedEffect(bottomBarMessage) {
+        bottomBarMessage?.timeoutSeconds?.let {
+            delay(it * 1000L)
             onClose(null)
-            bottomBarMessageDismissId = 0
         }
     }
 
+    // add transparent touch handler if dismissible
     if (bottomBarVisibleState.targetState && bottomBarMessage != null) {
-        Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .rememberedClickable(indication = null,
-                    interactionSource = remember { MutableInteractionSource() }) {
-                    if (bottomBarMessage?.isDismissible == true) onClose(null)
-                }
-        )
+        bottomBarMessage?.let {
+            if (it.isDismissible) {
+                Box(
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .rememberedClickable(indication = null,
+                            interactionSource = remember { MutableInteractionSource() }
+                        ) {
+                            scope.launch { onClose(null) }
+                        }
+                )
+            }
+        }
+
     }
 
     AnimatedVisibility(
@@ -68,14 +88,9 @@ fun BottomBarContainer(appState: CodeAppState) {
             animationSpec = tween(300)
         ),
     ) {
-        BottomBarView(bottomBarMessage = bottomBarMessage, onClose, onBackPressed)
-    }
-
-    LaunchedEffect(bottomBarMessage) {
-        bottomBarMessage?.timeoutSeconds?.let { timeout ->
-            Timer().schedule(timerTask {
-                onClose(null)
-            }, timeout.toLong() * 1000)
+        val closeWith: (BottomBarManager.BottomBarActionType?) -> Unit = { type ->
+            scope.launch { onClose(type) }
         }
+        BottomBarView(bottomBarMessage = bottomBarMessage, closeWith, onBackPressed = { closeWith(null)})
     }
 }
diff --git a/app/src/main/java/com/getcode/ui/components/BottomBarView.kt b/app/src/main/java/com/getcode/ui/components/BottomBarView.kt
@@ -35,7 +35,7 @@ fun BottomBarView(
     LaunchedEffect(bottomBarMessage) {
         trace("bottom bar message shown=${bottomBarMessage.title}")
     }
-    BackHandler {
+    BackHandler(enabled = bottomBarMessage.isDismissible) {
         onBackPressed()
     }
 
diff --git a/app/src/main/java/com/getcode/view/main/home/HomeViewModel.kt b/app/src/main/java/com/getcode/view/main/home/HomeViewModel.kt
@@ -414,9 +414,9 @@ class HomeViewModel @Inject constructor(
 
         // this should not be in the view model
         sendTransactionDisposable?.dispose()
-        sendTransactionRepository.init(amount = amountFloor, owner = owner)
+        sendTransactionRepository.init(amountFloor, organizer, owner)
         sendTransactionDisposable =
-            sendTransactionRepository.startTransaction(organizer)
+            sendTransactionRepository.startTransaction()
                 .subscribe({
                     cancelSend(PresentationStyle.Pop)
                     vibrator.vibrate()
@@ -1413,6 +1413,8 @@ class HomeViewModel @Inject constructor(
             }
             delay(2500)
 
+            billDismissTimer?.cancel()
+
             BottomBarManager.showMessage(
                 BottomBarManager.BottomBarMessage(
                     title = getString(R.string.prompt_title_didYouSendLink),
@@ -1429,6 +1431,12 @@ class HomeViewModel @Inject constructor(
                         cancelRemoteSend(giftCard, amount)
                         cancelSend(style = PresentationStyle.Slide)
                     },
+                    onClose = {
+                        if (it == null) {
+                            cancelSend(style = PresentationStyle.Pop)
+                            vibrator.vibrate()
+                        }
+                    },
                     type = BottomBarManager.BottomBarMessageType.REMOTE_SEND,
                     isDismissible = false,
                     timeoutSeconds = 60

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ fun BottomBarView(`
`35`	`35`	`LaunchedEffect(bottomBarMessage) {`
`36`	`36`	`trace("bottom bar message shown=${bottomBarMessage.title}")`
`37`	`37`	`}`
`38`		`- BackHandler {`
	`38`	`+ BackHandler(enabled = bottomBarMessage.isDismissible) {`
`39`	`39`	`onBackPressed()`
`40`	`40`	`}`
`41`	`41`