diff options
Diffstat (limited to 'wallet/src')
3 files changed, 5 insertions, 15 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/MainViewModel.kt b/wallet/src/main/java/net/taler/wallet/MainViewModel.kt index aa9b0f1..e660676 100644 --- a/wallet/src/main/java/net/taler/wallet/MainViewModel.kt +++ b/wallet/src/main/java/net/taler/wallet/MainViewModel.kt @@ -71,7 +71,7 @@ class MainViewModel(val app: Application) : AndroidViewModel(app) { private val api = WalletBackendApi(app) { payload -> if (payload.optString("operation") == "init") { val result = payload.getJSONObject("result") - val versions = result.getJSONObject("supported_protocol_versions") + val versions = result.getJSONObject("versionInfo") exchangeVersion = versions.getString("exchange") merchantVersion = versions.getString("merchant") } else if (payload.getString("type") != "waiting-for-retry") { // ignore ping diff --git a/wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt b/wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt index 74740ca..0af4262 100644 --- a/wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt +++ b/wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt @@ -162,7 +162,7 @@ class PaymentManager( mDepositState.value = DepositState.Error(it.userFacingMsg) }.onSuccess { mDepositState.value = DepositState.FeesChecked( - effectiveDepositAmount = it.effectiveDepositAmount.amount, + effectiveDepositAmount = it.effectiveDepositAmount, ) } } @@ -195,8 +195,8 @@ class PaymentManager( @Serializable data class PrepareDepositResponse( - val totalDepositCost: AmountJson, - val effectiveDepositAmount: AmountJson, + val totalDepositCost: Amount, + val effectiveDepositAmount: Amount, ) @Serializable @@ -204,13 +204,3 @@ data class CreateDepositGroupResponse( val depositGroupId: String, val transactionId: String, ) - -@Serializable -@Deprecated("no idea why this is now in the API") -data class AmountJson( - val currency: String, - val value: Long, - val fraction: Int, -) { - val amount = Amount(currency, value, fraction) -} diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt index 50f95c0..0e7ef07 100644 --- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt @@ -161,7 +161,7 @@ class TransactionsFragment : Fragment(), OnTransactionClickListener, ActionMode. // workaround to avoid issues with some emulators and keyboard devices // firing twice if a keyboard enter is used // see https://code.google.com/p/android/issues/detail?id=24599 - item.actionView.clearFocus() + searchView.clearFocus() onSearch(query) return true } |