[taler-taler-android] branch master updated (7f351d4 -> 4aaf660)

[gnunet]

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

torsten-grote pushed a change to branch master
in repository taler-android.

    from 7f351d4  [wallet] release 0.9.3+p9
     new 5a8920d  [wallet] Update refunds to new API
     new 4aaf660  [wallet] remove empty Dutch translation

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/java/net/taler/wallet/MainActivity.kt |  16 +-
 .../java/net/taler/wallet/refund/RefundManager.kt  |  12 +-
 .../wallet/transactions/TransactionManager.kt      |  12 ++
 wallet/src/main/res/values-nl/strings.xml          | 233 +--------------------
 wallet/src/main/res/values/strings.xml             |   2 +-
 5 files changed, 29 insertions(+), 246 deletions(-)

diff --git a/wallet/src/main/java/net/taler/wallet/MainActivity.kt 
b/wallet/src/main/java/net/taler/wallet/MainActivity.kt
index cfeeb31..4cbd738 100644
--- a/wallet/src/main/java/net/taler/wallet/MainActivity.kt
+++ b/wallet/src/main/java/net/taler/wallet/MainActivity.kt
@@ -22,8 +22,6 @@ import android.content.Context
 import android.content.Intent
 import android.content.Intent.ACTION_VIEW
 import android.content.IntentFilter
-import android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET
-import android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED
 import android.net.Uri
 import android.os.Bundle
 import android.util.Log
@@ -38,6 +36,7 @@ import androidx.core.os.bundleOf
 import androidx.core.view.GravityCompat.START
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Observer
+import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.viewModelScope
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
@@ -312,10 +311,15 @@ class MainActivity : AppCompatActivity(), 
OnNavigationItemSelectedListener,
                 }
             }
             is RefundStatus.Success -> {
-                val amount = status.response.amountRefundGranted
-                model.showTransactions(amount.currency)
-                val str = getString(R.string.refund_success, amount.amountStr)
-                Snackbar.make(ui.navView, str, LENGTH_LONG).show()
+                lifecycleScope.launch {
+                    val transactionId = status.response.transactionId
+                    val transaction = 
model.transactionManager.getTransactionById(transactionId)
+                    if (transaction != null) {
+                        val currency = transaction.amountRaw.currency
+                        model.showTransactions(currency)
+                        Snackbar.make(ui.navView, 
getString(R.string.refund_success), LENGTH_LONG).show()
+                    }
+                }
             }
         }
     }
diff --git a/wallet/src/main/java/net/taler/wallet/refund/RefundManager.kt 
b/wallet/src/main/java/net/taler/wallet/refund/RefundManager.kt
index 29f18c7..96e939b 100644
--- a/wallet/src/main/java/net/taler/wallet/refund/RefundManager.kt
+++ b/wallet/src/main/java/net/taler/wallet/refund/RefundManager.kt
@@ -21,21 +21,17 @@ import androidx.lifecycle.MutableLiveData
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
-import net.taler.common.Amount
 import net.taler.wallet.backend.TalerErrorInfo
 import net.taler.wallet.backend.WalletBackendApi
 
 sealed class RefundStatus {
     data class Error(val error: TalerErrorInfo) : RefundStatus()
-    data class Success(val response: RefundResponse) : RefundStatus()
+    data class Success(val response: StartRefundQueryForUriResponse) : 
RefundStatus()
 }
 
 @Serializable
-data class RefundResponse(
-    val amountEffectivePaid: Amount,
-    val amountRefundGranted: Amount,
-    val amountRefundGone: Amount,
-    val pendingAtExchange: Boolean
+data class StartRefundQueryForUriResponse(
+    val transactionId: String,
 )
 
 class RefundManager(
@@ -46,7 +42,7 @@ class RefundManager(
     fun refund(refundUri: String): LiveData<RefundStatus> {
         val liveData = MutableLiveData<RefundStatus>()
         scope.launch {
-            api.request("applyRefund", RefundResponse.serializer()) {
+            api.request("startRefundQueryForUri", 
StartRefundQueryForUriResponse.serializer()) {
                 put("talerRefundUri", refundUri)
             }.onError {
                 liveData.postValue(RefundStatus.Error(it))
diff --git 
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt 
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt
index df62f31..edd2912 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt
@@ -124,6 +124,18 @@ class TransactionManager(
         }
     }
 
+    suspend fun getTransactionById(transactionId: String): Transaction? {
+        var transaction: Transaction? = null
+        api.request("getTransactionById", Transaction.serializer()) {
+            put("transactionId", transactionId)
+        }.onError {
+            Log.e(TAG, "Error getting transaction $it")
+        }.onSuccess { result ->
+            transaction = result
+        }
+        return transaction
+    }
+
     fun selectTransaction(transaction: Transaction) {
         mSelectedTransaction.postValue(transaction)
     }
diff --git a/wallet/src/main/res/values-nl/strings.xml 
b/wallet/src/main/res/values-nl/strings.xml
index 0e6fc67..f23dced 100644
--- a/wallet/src/main/res/values-nl/strings.xml
+++ b/wallet/src/main/res/values-nl/strings.xml
@@ -13,235 +13,6 @@
   ~
   ~ You should have received a copy of the GNU General Public License along 
with
   ~ GNU Taler; see the file COPYING.  If not, see 
<http://www.gnu.org/licenses/>
-  --><resources xmlns:tools="http://schemas.android.com/tools";>
-    <string name="app_name"></string>
-    <string name="google_play_title" 
tools:keep="@string/google_play_title"></string>
-    <string name="google_play_short_desc" 
tools:keep="@string/google_play_short_desc"></string>
-    <string name="google_play_full_desc" 
tools:keep="@string/google_play_full_desc"></string>
-    <string name="nav_header_title"></string>
-    <string name="nav_header_subtitle"></string>
-    <string name="nav_prompt_withdraw"></string>
-    <string name="nav_exchange_tos"></string>
-    <string name="nav_exchange_select"></string>
-    <string name="nav_exchange_fees"></string>
-    <string name="nav_error"></string>
-    <string name="button_back"></string>
-    <string name="button_scan_qr_code"></string>
-    <string name="button_scan_qr_code_label"></string>
-    <string name="enter_uri"></string>
-    <string name="copy" tools:override="true"></string>
-    <string name="copy_uri"></string>
-    <string name="paste"></string>
-    <string name="paste_invalid"></string>
-    <string name="uri_invalid"></string>
-    <string name="ok"></string>
-    <string name="cancel"></string>
-    <string name="search"></string>
-    <string name="menu"></string>
-    <string name="or"></string>
-    <string name="currency"></string>
-    <!-- The count should be mirrored in RTL languages -->
-    <string name="char_count"></string>
-    <string name="offline"></string>
-    <string name="error_unsupported_uri"></string>
-    <string name="menu_settings"></string>
-    <string name="menu_retry_pending_operations"></string>
-    <string name="host_apdu_service_desc"></string>
-    <string name="balances_title"></string>
-    <string name="amount_positive"></string>
-    <string name="amount_negative"></string>
-    <string name="amount_chosen"></string>
-    <string name="balances_inbound_label"></string>
-    <string name="balances_empty_state"></string>
-    <string name="transactions_title"></string>
-    <string name="transactions_balance"></string>
-    <string name="transactions_send_funds"></string>
-    <string name="transactions_receive_funds"></string>
-    <string name="transactions_empty"></string>
-    <string name="transactions_empty_search"></string>
-    <string name="transactions_error"></string>
-    <string name="transactions_detail_title"></string>
-    <string name="transactions_detail_title_currency"></string>
-    <string name="transactions_delete"></string>
-    <string name="transactions_retry"></string>
-    <string name="transactions_abort"></string>
-    <string name="transactions_fail"></string>
-    <string name="transactions_suspend"></string>
-    <string name="transactions_resume"></string>
-    <string name="transactions_select_all"></string>
-    <string name="transactions_delete_dialog_title"></string>
-    <string name="transactions_delete_dialog_message"></string>
-    <string name="transactions_delete_selected_dialog_message"></string>
-    <string name="transactions_abort_dialog_title"></string>
-    <string name="transactions_abort_dialog_message"></string>
-    <string name="transactions_fail_dialog_title"></string>
-    <string name="transactions_fail_dialog_message"></string>
-    <string name="transactions_cancel_dialog_message"></string>
-    <!-- Transactions -->
-    <string name="transaction_paid"></string>
-    <string name="transaction_order_total"></string>
-    <string name="transaction_order"></string>
-    <string name="transaction_order_id"></string>
-    <string name="transaction_tip_from"></string>
-    <string name="transaction_refund"></string>
-    <string name="transaction_refund_from"></string>
-    <string name="transaction_pending"></string>
-    <string name="transaction_refresh"></string>
-    <string name="transaction_deposit"></string>
-    <string name="transaction_peer_push_debit"></string>
-    <string name="transaction_peer_pull_credit"></string>
-    <string name="transaction_peer_pull_debit"></string>
-    <string name="transaction_peer_push_credit"></string>
-    <string name="transaction_action_kyc"></string>
-    <string name="transaction_dummy_title"></string>
-    <string name="payment_title"></string>
-    <string name="payment_fee"></string>
-    <string name="payment_button_confirm"></string>
-    <string name="payment_label_amount_total"></string>
-    <string name="payment_label_order_summary"></string>
-    <string name="payment_error"></string>
-    <string name="payment_balance_insufficient"></string>
-    <string name="payment_aborted"></string>
-    <string name="payment_failed"></string>
-    <string name="payment_initiated"></string>
-    <string name="payment_already_paid_title"></string>
-    <string name="payment_already_paid"></string>
-    <string name="receive_amount"></string>
-    <string name="receive_amount_invalid"></string>
-    <string name="receive_intro"></string>
-    <string name="receive_withdraw"></string>
-    <string name="receive_peer"></string>
-    <string name="receive_peer_title"></string>
-    <string name="receive_peer_create_button"></string>
-    <string name="receive_peer_invoice_instruction"></string>
-    <string name="receive_peer_invoice_uri"></string>
-    <string name="send_amount"></string>
-    <string name="send_intro"></string>
-    <string name="send_deposit"></string>
-    <string name="send_deposit_bitcoin"></string>
-    <string name="send_deposit_title"></string>
-    <string name="send_deposit_iban"></string>
-    <string name="send_deposit_iban_error"></string>
-    <string name="send_deposit_bic_error"></string>
-    <string name="send_deposit_bic"></string>
-    <string name="send_deposit_name"></string>
-    <string name="send_deposit_bitcoin_address"></string>
-    <string name="send_deposit_check_fees_button"></string>
-    <string name="send_deposit_amount_effective"></string>
-    <string name="send_deposit_create_button"></string>
-    <string name="send_deposit_bitcoin_create_button"></string>
-    <string name="send_peer"></string>
-    <string name="send_peer_bitcoin"></string>
-    <string name="send_peer_title"></string>
-    <string name="send_peer_create_button"></string>
-    <string name="send_peer_warning"></string>
-    <string name="send_peer_payment_instruction"></string>
-    <string name="send_peer_payment_amount_received"></string>
-    <string name="send_peer_payment_amount_sent"></string>
-    <string name="send_peer_expiration_period"></string>
-    <string name="send_peer_expiration_1d"></string>
-    <string name="send_peer_expiration_7d"></string>
-    <string name="send_peer_expiration_30d"></string>
-    <string name="send_peer_expiration_custom"></string>
-    <string name="send_peer_expiration_days"></string>
-    <string name="send_peer_expiration_hours"></string>
-    <string name="send_peer_purpose"></string>
-    <string name="pay_peer_title"></string>
-    <string name="pay_peer_intro"></string>
-    <string name="receive_peer_payment_title"></string>
-    <string name="receive_peer_payment_intro"></string>
-    <string name="withdraw_initiated"></string>
-    <string name="withdraw_title"></string>
-    <string name="withdraw_total"></string>
-    <string name="withdraw_fees"></string>
-    <string name="withdraw_restrict_age"></string>
-    <string name="withdraw_restrict_age_unrestricted"></string>
-    <string name="withdraw_exchange"></string>
-    <string name="withdraw_button_confirm"></string>
-    <string name="withdraw_button_confirm_bank"></string>
-    <string name="withdraw_button_tos"></string>
-    <string name="withdraw_waiting_confirm"></string>
-    <string name="withdraw_manual_title"></string>
-    <string name="withdraw_amount"></string>
-    <string name="withdraw_amount_error"></string>
-    <string name="withdraw_manual_payment_options"></string>
-    <string name="withdraw_manual_check_fees"></string>
-    <string name="withdraw_manual_ready_title"></string>
-    <string name="withdraw_manual_ready_intro"></string>
-    <string name="withdraw_manual_ready_details_intro"></string>
-    <string name="withdraw_manual_bitcoin_title"></string>
-    <string name="withdraw_manual_bitcoin_intro"></string>
-    <string name="withdraw_manual_ready_iban"></string>
-    <string name="withdraw_manual_ready_subject"></string>
-    <string name="withdraw_manual_ready_bank_button"></string>
-    <string name="withdraw_manual_ready_cancel"></string>
-    <string name="withdraw_manual_ready_warning"></string>
-    <string name="withdraw_error_title"></string>
-    <string name="withdraw_error_message"></string>
-    <string name="withdraw_error_test"></string>
-    <string name="exchange_settings_title"></string>
-    <string name="exchange_settings_summary"></string>
-    <string name="exchange_list_title"></string>
-    <string name="exchange_list_empty"></string>
-    <string name="exchange_list_currency"></string>
-    <string name="exchange_list_add"></string>
-    <string name="exchange_add_url"></string>
-    <string name="exchange_add_error"></string>
-    <string name="exchange_list_error"></string>
-    <string name="exchange_menu_manual_withdraw"></string>
-    <string name="exchange_fee_withdrawal_fee_label"></string>
-    <string name="exchange_fee_overhead_label"></string>
-    <string name="exchange_fee_coin_expiration_label"></string>
-    <string name="exchange_fee_coin_fees_label"></string>
-    <string name="exchange_fee_wire_fees_label"></string>
-    <plurals name="exchange_fee_coin">
-        <item quantity="one"></item>
-        <item quantity="other"></item>
-    </plurals>
-    <string name="exchange_fee_withdraw_fee"></string>
-    <string name="exchange_fee_deposit_fee"></string>
-    <string name="exchange_fee_refresh_fee"></string>
-    <string name="exchange_fee_refund_fee"></string>
-    <string name="exchange_fee_wire_fee_timespan"></string>
-    <string name="exchange_fee_wire_fee_wire_fee"></string>
-    <string name="exchange_fee_wire_fee_closing_fee"></string>
-    <string name="exchange_tos_accept"></string>
-    <string name="exchange_tos_error"></string>
-    <string name="pending_operations_title"></string>
-    <string name="pending_operations_refuse"></string>
-    <string name="pending_operations_no_action"></string>
-    <string name="settings_dev_mode"></string>
-    <string name="settings_dev_mode_summary"></string>
-    <string name="settings_withdraw_testkudos"></string>
-    <string name="settings_withdraw_testkudos_summary"></string>
-    <string name="settings_logcat"></string>
-    <string name="settings_logcat_summary"></string>
-    <string name="settings_logcat_error"></string>
-    <string name="settings_logcat_success"></string>
-    <string name="settings_db_export"></string>
-    <string name="settings_db_export_summary"></string>
-    <string name="settings_db_export_error"></string>
-    <string name="settings_db_export_success"></string>
-    <string name="settings_version_app"></string>
-    <string name="settings_version_core"></string>
-    <string name="settings_version_protocol_exchange"></string>
-    <string name="settings_version_protocol_merchant"></string>
-    <string name="settings_version_unknown"></string>
-    <string name="settings_test"></string>
-    <string name="settings_test_summary"></string>
-    <string name="settings_reset"></string>
-    <string name="settings_reset_summary"></string>
-    <string name="refund_title"></string>
-    <string name="refund_error"></string>
-    <string name="refund_success"></string>
-    <string name="tip_title"></string>
-    <string name="tip_already_accepted"></string>
-    <string name="tip_total"></string>
-    <string name="tip_fees"></string>
-    <string name="tip_exchange"></string>
-    <string name="tip_merchant_url"></string>
-    <string name="tip_button_confirm"></string>
-    <string name="tip_received"></string>
-    <string name="wifi_disabled_error"></string>
-    <string name="wifi_connect_error"></string>
+  -->
+<resources>
 </resources>
\ No newline at end of file
diff --git a/wallet/src/main/res/values/strings.xml 
b/wallet/src/main/res/values/strings.xml
index 407fd72..3b05ae9 100644
--- a/wallet/src/main/res/values/strings.xml
+++ b/wallet/src/main/res/values/strings.xml
@@ -273,7 +273,7 @@ GNU Taler is immune against many types of fraud, such as 
phishing of credit card
 
     <string name="refund_title">Refund</string>
     <string name="refund_error">Error processing refund</string>
-    <string name="refund_success">Refund received: %s</string>
+    <string name="refund_success">Refund received!</string>
 
     <string name="tip_title">Reward</string>
     <string name="tip_already_accepted">This reward was already 
accepted.</string>

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