cashless2ecash

commit 8d9ae31048e404d51818f169d15ca6cf69620072
parent 8055aaf68b52b5d4fd2578152e6f07f0b0e102b3
Author: Joel-Haeberli <haebu@rubigen.ch>
Date:   Tue, 21 May 2024 23:20:08 +0200

feat: deactivate log

Diffstat:
M
c2ec/exponential-backoff.go
 | 
9
++-------
M
wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/withdrawal/WithdrawalViewModel.kt
 | 
4
+++-

2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/c2ec/exponential-backoff.go b/c2ec/exponential-backoff.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	"math"
 	"math/rand"
 	"time"
@@ -31,17 +30,13 @@ func ShouldStartRetry(
 	backoffMs := exponentialBackoffMs(retryCount)
 	randomizedBackoff := randomizeBackoff(backoffMs)
 	if backoffMs > int64(limitMs) {
-		LogInfo("exponential-backoff", fmt.Sprintf("backoff limit exceeded. setting manual limit: %d", limitMs))
+		//LogInfo("exponential-backoff", fmt.Sprintf("backoff limit exceeded. setting manual limit: %d", limitMs))
 		randomizedBackoff = int64(limitMs)
 	}
 
 	now := time.Now().Unix()
 	backoffTime := lastExecution.Unix() + randomizedBackoff
-	if now > backoffTime {
-		LogInfo("exponential-backoff", "backoff time not exceeded. do not retry yet.")
-		return false
-	}
-	return true
+	return now <= backoffTime
 }
 
 func exponentialBackoffMs(retries int) int64 {
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
@@ -288,7 +288,9 @@ class WithdrawalViewModel(
 
     fun withdrawalOperationFailed() {
         viewModelScope.launch {
-            if (_uiState.value.transactionState == TransactionState.AUTHORIZATION_PENDING) {
+            if (_uiState.value.transactionState == TransactionState.AUTHORIZATION_PENDING ||
+                _uiState.value.transactionState == TransactionState.AUTHORIZATION_FAILED ||
+                _uiState.value.transactionState == TransactionState.COMPLETION_FAILED) {
                 terminalClient!!.abortWithdrawal(uiState.value.encodedWopid) {}
 //            SummaryActivity.summary.success = false
 //            val activity = WithdrawalActivity()