[taler-cashless2ecash] branch master updated: fix: correct till-api version

[gnunet]

This is an automated email from the git hooks/post-receive script.

joel-haeberli pushed a commit to branch master
in repository cashless2ecash.

The following commit(s) were added to refs/heads/master by this push:
     new be0bcae  fix: correct till-api version
be0bcae is described below

commit be0bcae390ac5f978db5999a367c9c6497d4f10b
Author: Joel-Haeberli <haebu@rubigen.ch>
AuthorDate: Wed May 1 10:54:44 2024 +0200

    fix: correct till-api version
---
 wallee-c2ec/app/build.gradle.kts                   |  2 +-
 .../java/ch/bfh/habej2/wallee_c2ec/MainActivity.kt |  7 +-----
 ...alClient.kt => TerminalClientImplementation.kt} |  6 +----
 .../client/taler/model/TerminalsApiModel.kt        | 26 ++++++++++++++++++++++
 .../client/wallee/WalleeResponseHandler.kt         | 15 -------------
 .../habej2/wallee_c2ec/withdrawal/AmountScreen.kt  |  8 ++++++-
 .../withdrawal/ExchangeSelectionScreen.kt          |  1 -
 .../withdrawal/RegisterWithdrawalScreen.kt         |  2 --
 .../wallee_c2ec/withdrawal/WithdrawalActivity.kt   | 24 ++++----------------
 .../wallee_c2ec/withdrawal/WithdrawalViewModel.kt  | 11 ++++-----
 wallee-c2ec/gradle/libs.versions.toml              |  2 +-
 11 files changed, 47 insertions(+), 57 deletions(-)

diff --git a/wallee-c2ec/app/build.gradle.kts b/wallee-c2ec/app/build.gradle.kts
index bc8cb03..a2e1bc0 100644
--- a/wallee-c2ec/app/build.gradle.kts
+++ b/wallee-c2ec/app/build.gradle.kts
@@ -10,7 +10,7 @@ android {
     defaultConfig {
         applicationId = "ch.bfh.habej2.wallee_c2ec"
         minSdk = 27
-        targetSdk = 28
+        targetSdk = 34
         versionCode = 1
         versionName = "1.0"
 
diff --git 
a/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/MainActivity.kt 
b/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/MainActivity.kt
index be02bd8..3de096b 100644
--- a/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/MainActivity.kt
+++ b/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/MainActivity.kt
@@ -4,13 +4,13 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.Button
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -41,9 +41,4 @@ class MainActivity : ComponentActivity() {
             }
         }
     }
-
-    @Composable
-    fun SelectExchangeScreen() {
-
-    }
 }
diff --git 
a/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/client/taler/TerminalClient.kt
 
b/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/client/taler/TerminalClientImplementation.kt
similarity index 97%
rename from 
wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/client/taler/TerminalClient.kt
rename to 
wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/client/taler/TerminalClientImplementation.kt
index a97e216..376e203 100644
--- 
a/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/client/taler/TerminalClient.kt
+++ 
b/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/client/taler/TerminalClientImplementation.kt
@@ -23,7 +23,7 @@ class TerminalClientException(
     msg: String
 ): RuntimeException(msg)
 
-class TerminalClient(
+class TerminalClientImplementation  (
     private val config: TalerTerminalConfig
 ) {
 
@@ -158,7 +158,3 @@ class TerminalClient(
         }
     }
 }
-
-private fun RequestBody.Companion.create(toMediaType: MediaType): Any {
-    TODO("Not yet implemented")
-}
diff --git 
a/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/client/taler/model/TerminalsApiModel.kt
 
b/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/client/taler/model/TerminalsApiModel.kt
index c19faeb..1d5389b 100644
--- 
a/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/client/taler/model/TerminalsApiModel.kt
+++ 
b/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/client/taler/model/TerminalsApiModel.kt
@@ -23,3 +23,29 @@ data class TerminalWithdrawalConfirmationRequest(
     val providerTransactionId: String,
     val terminalFees: Amount
 )
+
+enum class WithdrawalOperationStatus(val value: String) {
+
+    PENDING("pending"),
+    SELECTED("selected"),
+    CONFIRMED("confirmed"),
+    ABORTED("aborted")
+}
+
+data class BankWitdrawalOperationStatus(
+    val status: WithdrawalOperationStatus,
+    val amount: Amount,
+    val suggestedAmount: Amount,
+    val maxAmount: Amount,
+    val cardFees: Amount,
+    val senderWire: String,
+    val suggestedExchange: String,
+    val requiredExchange: String,
+    val confirmTransferUrl: String,
+    val wireTypes: Array<String>,
+    val selectedReservePub: String,
+    val selectedExchangeAccount: String,
+    val aborted: Boolean,
+    val selectionDone: Boolean,
+    val transferDone: Boolean
+)
diff --git 
a/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/client/wallee/WalleeResponseHandler.kt
 
b/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/client/wallee/WalleeResponseHandler.kt
index 7245f89..6653171 100644
--- 
a/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/client/wallee/WalleeResponseHandler.kt
+++ 
b/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/client/wallee/WalleeResponseHandler.kt
@@ -11,21 +11,6 @@ class WalleeResponseHandler(
     private val model: WithdrawalViewModel
 ) : ResponseHandler() {
 
-    override fun authorizeTransactionReply(response: TransactionResponse?) {
-
-        // TODO find out how to read the transaction id here....
-
-        if (response == null) {
-            // TODO
-            return
-        }
-
-        response.transaction.metaData.forEach{
-            println("${it.key}=${it.value}")
-        }
-        response.transaction.metaData.get("id")
-    }
-
     override fun completeTransactionReply(response: 
TransactionCompletionResponse?) {
 
         if (response == null) {
diff --git 
a/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/withdrawal/AmountScreen.kt
 
b/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/withdrawal/AmountScreen.kt
index e22ea0a..638ffda 100644
--- 
a/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/withdrawal/AmountScreen.kt
+++ 
b/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/withdrawal/AmountScreen.kt
@@ -25,7 +25,8 @@ fun AmountScreen(model: WithdrawalViewModel, 
navigateToWhenAmountEntered: () ->
         TextField(
             value = "",
             onValueChange = {
-                model.updateAmount(it)
+                            println(it)
+                //model.updateAmount(it)
             },
             label = { Text(text = "Enter amount") },
             placeholder = { Text(text = "amount") },
@@ -36,6 +37,11 @@ fun AmountScreen(model: WithdrawalViewModel, 
navigateToWhenAmountEntered: () ->
         )
 
         Button(onClick = {
+            val success = model.setupWithdrawal()
+            if (!success) {
+                activity.finish()
+            }
+            model.withdrawalOperationFailed()
             navigateToWhenAmountEntered()
         }) {
             Text(text = "pay")
diff --git 
a/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/withdrawal/ExchangeSelectionScreen.kt
 
b/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/withdrawal/ExchangeSelectionScreen.kt
index 1f03911..f9afffa 100644
--- 
a/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/withdrawal/ExchangeSelectionScreen.kt
+++ 
b/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/withdrawal/ExchangeSelectionScreen.kt
@@ -27,7 +27,6 @@ fun ExchangeSelectionScreen(
         //  config must contain display name, credentials (generated by cli)
         //  and the base url of the c2ec bank-integration api
 
-        val ctx = LocalContext.current
         Button(onClick = {
             model.exchangeUpdated(
                 activity,
diff --git 
a/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/withdrawal/RegisterWithdrawalScreen.kt
 
b/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/withdrawal/RegisterWithdrawalScreen.kt
index 1c9a636..59a43fd 100644
--- 
a/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/withdrawal/RegisterWithdrawalScreen.kt
+++ 
b/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/withdrawal/RegisterWithdrawalScreen.kt
@@ -19,8 +19,6 @@ fun RegisterWithdrawalScreen(
     val uiState by model.uiState.collectAsState()
     val activity = (LocalContext.current as Activity)
 
-    model.setupWithdrawal()
-
     model.startAuthorizationWhenReadyOrAbort(navigateToWhenRegistered) {
         activity.finish()
     }
diff --git 
a/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/withdrawal/WithdrawalActivity.kt
 
b/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/withdrawal/WithdrawalActivity.kt
index c17d436..44e969a 100644
--- 
a/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/withdrawal/WithdrawalActivity.kt
+++ 
b/wallee-c2ec/app/src/main/java/ch/bfh/habej2/wallee_c2ec/withdrawal/WithdrawalActivity.kt
@@ -3,6 +3,7 @@ package ch.bfh.habej2.wallee_c2ec.withdrawal
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
@@ -17,12 +18,10 @@ class WithdrawalActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
 
         val model = WithdrawalViewModel()
-        walleeClient = ApiClient(WalleeResponseHandler(this, model))
-        walleeClient.bind(this)
-        walleeClient.checkApiServiceCompatibility()
 
         setContent {
 
+
             val navController = rememberNavController()
 
             NavHost(navController = navController, startDestination = 
"chooseExchangeScreen") {
@@ -46,21 +45,10 @@ class WithdrawalActivity : ComponentActivity() {
                 }
             }
         }
-    }
-
-    override fun onStart() {
-        super.onStart()
-        walleeClient.bind(this)
-    }
 
-    override fun onResume() {
-        super.onResume()
+        walleeClient = ApiClient(WalleeResponseHandler(this, model))
         walleeClient.bind(this)
-    }
-
-    override fun onStop() {
-        super.onStop()
-        walleeClient.unbind(this)
+        walleeClient.checkApiServiceCompatibility()
     }
 
     override fun onDestroy() {
@@ -68,8 +56,4 @@ class WithdrawalActivity : ComponentActivity() {
         walleeClient.unbind(this)
     }
 
-    override fun onPause() {
-        super.onPause()
-        walleeClient.unbind(this)
-    }
 }
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
index 2b8f10a..320b6a3 100644
--- 
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
@@ -8,7 +8,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import ch.bfh.habej2.wallee_c2ec.client.taler.TerminalClient
+import ch.bfh.habej2.wallee_c2ec.client.taler.TerminalClientImplementation
 import ch.bfh.habej2.wallee_c2ec.client.taler.config.TalerTerminalConfig
 import 
ch.bfh.habej2.wallee_c2ec.client.taler.model.TerminalWithdrawalConfirmationRequest
 import ch.bfh.habej2.wallee_c2ec.client.taler.model.TerminalWithdrawalSetup
@@ -54,13 +54,13 @@ class WithdrawalViewModel(
     vararg closeables: Closeable
 ) : ViewModel(*closeables) {
 
-    private var terminalClient: TerminalClient? = null
+    private var terminalClient: TerminalClientImplementation? = null
     private val _uiState = MutableStateFlow(MutableWithdrawalOperationState())
     val uiState: StateFlow<WithdrawalOperationState> = _uiState
 
     fun exchangeUpdated(activity: Activity, cfg: TalerTerminalConfig) {
 
-        terminalClient = TerminalClient(cfg)
+        terminalClient = TerminalClientImplementation(cfg)
         _uiState.value = MutableWithdrawalOperationState() // reset withdrawal 
operation
         val optionalApiCfg = terminalClient!!.terminalsConfig()
         if (!optionalApiCfg.isPresent) {
@@ -70,7 +70,7 @@ class WithdrawalViewModel(
         updateCurrency(optionalApiCfg.get().currency)
     }
 
-    fun setupWithdrawal() {
+    fun setupWithdrawal(): Boolean {
 
         val setupReq = TerminalWithdrawalSetup(
             _uiState.value.requestUid,
@@ -79,10 +79,11 @@ class WithdrawalViewModel(
 
         val res = terminalClient!!.setupWithdrawal(setupReq)
         if (!res.isPresent) {
-            withdrawalOperationFailed()
+            return false
         }
 
         _uiState.value.encodedWopid = res.get().withdrawalId
+        return true
     }
 
     fun updateAmount(amount: String) {
diff --git a/wallee-c2ec/gradle/libs.versions.toml 
b/wallee-c2ec/gradle/libs.versions.toml
index b14cea4..9b827d8 100644
--- a/wallee-c2ec/gradle/libs.versions.toml
+++ b/wallee-c2ec/gradle/libs.versions.toml
@@ -13,7 +13,7 @@ activityCompose = "1.7.0"
 composeBom = "2023.08.00"
 moshiKotlin = "1.15.1"
 okhttp = "4.12.0"
-sdk = "0.9.12"
+sdk = "0.9.20"
 navigationCompose = "2.7.7"
 
 [libraries]

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.