cashless2ecash

commit 7257325fc54f664bf3e5c79d543f5055797a9f13
parent 6e8355ac8026dc66bad91051117601c1bffc80b1
Author: fsb2 <benjamin.fehrensen@bfh.ch>
Date:   Wed,  9 Apr 2025 15:09:29 +0200

Withdrawal abort fixed.

Diffstat:
M
wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/withdrawal/WithdrawalViewModel.kt
 | 
23
+++++------------------
M
wallee-c2ec/app/src/main/res/values/strings.xml
 | 
1
+

2 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/withdrawal/WithdrawalViewModel.kt b/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/withdrawal/WithdrawalViewModel.kt
@@ -319,24 +319,11 @@ class WithdrawalViewModel(
     }
 
     fun withdrawalOperationFailed(activity: Activity) {
-        viewModelScope.launch {
-            if (_uiState.value.withdrawalState == WithdrawalState.UNREADY_FOR_AUTHORIZATION ||
-                _uiState.value.withdrawalState == WithdrawalState.AUTHORIZATION_FAILED ||
-                _uiState.value.withdrawalState == WithdrawalState.COMPLETION_FAILED) {
-                terminalClient!!.abortWithdrawal(uiState.value.encodedWopid) {
-                    SummaryActivity.summary =
-                        Summary(
-                            _uiState.value.amount,
-                            _uiState.value.withdrawalFees,
-                            _uiState.value.currency,
-                            _uiState.value.encodedWopid,
-                            success = false
-                        )
-                    val intent = Intent(activity, SummaryActivity::class.java)
-                    activity.startActivity(intent)
-                }
-            }
-        }
+        println("withdrawal operation failed called")
+        Handler(Looper.getMainLooper()).post {
+            Toast.makeText(activity.baseContext, activity.getText(
+                R.string.aborted), Toast.LENGTH_SHORT).show()}
+        activity.finish()
     }
 
     fun validAmount(inp: String) = Regex("\\d+(\\.\\d+)?").matches(inp)
diff --git a/wallee-c2ec/app/src/main/res/values/strings.xml b/wallee-c2ec/app/src/main/res/values/strings.xml
@@ -9,4 +9,5 @@
     <string name="not_compatible">SDK is not compatible.</string>
     <string name="no_authorization">No authorization received.</string>
     <string name="wallee_custom_text">Buy Taler for your Wallet</string>
+    <string name="aborted">Withdrawal aborted</string>
 </resources>
 \ No newline at end of file