[taler-taler-android] branch master updated (d431660 -> 2a08cf2)

[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 d431660  Use constant for max subject length
     new f8f4284  [wallet] Add delete dialog in transactions list
     new 2a08cf2  [wallet] Fix order of buttons for cancel dialog

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:
 .../taler/wallet/transactions/TransactionDetailFragment.kt  |  2 +-
 .../net/taler/wallet/transactions/TransactionsFragment.kt   | 13 ++++++++++++-
 wallet/src/main/res/values/strings.xml                      |  1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git 
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt
 
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt
index eef2fd3..94b9774 100644
--- 
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt
+++ 
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt
@@ -102,7 +102,7 @@ abstract class TransactionDetailFragment : Fragment() {
         AlertDialog.Builder(requireContext(), R.style.DialogTheme)
             .setTitle(deleteDialogTitle)
             .setMessage(deleteDialogMessage)
-            .setPositiveButton(R.string.cancel) { dialog, _ ->
+            .setNeutralButton(R.string.cancel) { dialog, _ ->
                 dialog.cancel()
             }
             .setNegativeButton(deleteDialogButton) { dialog, _ ->
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 0e7ef07..969b0de 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt
@@ -25,6 +25,7 @@ import android.view.MenuItem
 import android.view.View
 import android.view.View.INVISIBLE
 import android.view.ViewGroup
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.SearchView
 import androidx.appcompat.widget.SearchView.OnQueryTextListener
 import androidx.fragment.app.Fragment
@@ -220,7 +221,17 @@ class TransactionsFragment : Fragment(), 
OnTransactionClickListener, ActionMode.
         when (item.itemId) {
             R.id.transaction_delete -> {
                 tracker?.selection?.toList()?.let { transactionIds ->
-                    transactionManager.deleteTransactions(transactionIds)
+                    AlertDialog.Builder(requireContext(), R.style.DialogTheme)
+                        .setTitle(R.string.transactions_delete)
+                        
.setMessage(R.string.transactions_delete_selected_dialog_message)
+                        .setNeutralButton(R.string.cancel) { dialog, _ ->
+                            dialog.cancel()
+                        }
+                        .setNegativeButton(R.string.transactions_delete) { 
dialog, _ ->
+                            
transactionManager.deleteTransactions(transactionIds)
+                            dialog.dismiss()
+                        }
+                        .show()
                 }
                 mode.finish()
             }
diff --git a/wallet/src/main/res/values/strings.xml 
b/wallet/src/main/res/values/strings.xml
index ea5cbdf..51c2ff3 100644
--- a/wallet/src/main/res/values/strings.xml
+++ b/wallet/src/main/res/values/strings.xml
@@ -87,6 +87,7 @@ GNU Taler is immune against many types of fraud, such as 
phishing of credit card
     <string name="transactions_select_all">Select All</string>
     <string name="transactions_delete_dialog_title">Delete Transaction</string>
     <string name="transactions_delete_dialog_message">Are you sure you want to 
remove this transaction from your wallet?</string>
+    <string name="transactions_delete_selected_dialog_message">Are you sure 
you want to remove the selected transactions from your wallet?</string>
     <string name="transactions_cancel_dialog_message">Are you sure you want to 
cancel this withdrawal? Funds still in transit might get lost.</string>
 
     <!-- Transactions -->

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