[wallet] URI handling improvements and DD51 fix

2 files changed, 14 insertions, 31 deletions

diff --git a/wallet/src/main/java/net/taler/wallet/HandleUriFragment.kt b/wallet/src/main/java/net/taler/wallet/HandleUriFragment.kt
index e91d56d..43011ec 100644
--- a/wallet/src/main/java/net/taler/wallet/HandleUriFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/HandleUriFragment.kt
@@ -22,6 +22,7 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast.LENGTH_LONG
 import androidx.compose.ui.platform.ComposeView
 import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
@@ -31,7 +32,6 @@ import androidx.lifecycle.Observer
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.viewModelScope
 import androidx.navigation.fragment.findNavController
-import com.google.android.material.snackbar.BaseTransientBottomBar
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -49,16 +49,16 @@ import java.util.Locale
 class HandleUriFragment: Fragment() {
     private val model: MainViewModel by activityViewModels()
 
-    var uri: String? = null
-    var from: String? = null
+    lateinit var uri: String
+    lateinit var from: String
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        uri = arguments?.getString("uri")
-        from = arguments?.getString("from")
+        uri = arguments?.getString("uri") ?: error("no uri passed")
+        from = arguments?.getString("from") ?: error("no from passed")
 
         return ComposeView(requireContext()).apply {
             setContent {
@@ -215,6 +215,7 @@ class HandleUriFragment: Fragment() {
                 if (exchange == null) withContext(Dispatchers.Main) {
                     model.showProgressBar.value = false
                     showError(R.string.exchange_add_error)
+                    findNavController().navigateUp()
                 } else {
                     model.exchangeManager.withdrawalExchange = exchange
                     withContext(Dispatchers.Main) {
@@ -224,7 +225,7 @@ class HandleUriFragment: Fragment() {
                                 putString("amount", response.amount.toJSONString())
                             }
                         }
-                        // there's more than one entry point, so use global action
+
                         findNavController().navigate(R.id.action_handleUri_to_manualWithdrawal, args)
                     }
                 }
@@ -249,14 +250,16 @@ class HandleUriFragment: Fragment() {
                     val transactionId = status.response.transactionId
                     val transaction = model.transactionManager.getTransactionById(transactionId)
                     if (transaction != null) {
-                        val currency = transaction.amountRaw.currency
-                        model.showTransactions(currency)
-                        Snackbar.make(requireView(), getString(R.string.refund_success),
-                            BaseTransientBottomBar.LENGTH_LONG
-                        ).show()
+                        // TODO: currency what? scopes are the cool thing now
+                        // val currency = transaction.amountRaw.currency
+                        // model.showTransactions(currency)
+                        Snackbar.make(requireView(), getString(R.string.refund_success), LENGTH_LONG).show()
                     }
+
+                    findNavController().navigateUp()
                 }
             }
+
         }
     }
 }
\ No newline at end of file
diff --git a/wallet/src/main/res/navigation/nav_graph.xml b/wallet/src/main/res/navigation/nav_graph.xml
index 2fc6c48..bc2e871 100644
--- a/wallet/src/main/res/navigation/nav_graph.xml
+++ b/wallet/src/main/res/navigation/nav_graph.xml
@@ -390,30 +390,10 @@
         app:destination="@id/sendFunds" />
 
     <action
-        android:id="@+id/action_global_promptWithdraw"
-        app:destination="@id/promptWithdraw" />
-
-    <action
-        android:id="@+id/action_global_manual_withdrawal"
-        app:destination="@id/nav_exchange_manual_withdrawal" />
-
-    <action
         android:id="@+id/action_global_promptPayment"
         app:destination="@id/promptPayment" />
 
     <action
-        android:id="@+id/action_global_prompt_pull_payment"
-        app:destination="@id/promptPullPayment" />
-
-    <action
-        android:id="@+id/action_global_prompt_push_payment"
-        app:destination="@id/promptPushPayment" />
-
-    <action
-        android:id="@+id/action_global_prompt_pay_template"
-        app:destination="@id/promptPayTemplate" />
-
-    <action
         android:id="@+id/action_nav_transactions_detail_withdrawal"
         app:destination="@id/nav_transactions_detail_withdrawal" />