[taler-taler-android] branch master updated (40358ae -> db4fbe0)

[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 40358ae  [wallet] another NetworkManager fix
     new 9ecd1e0  [wallet] Make title of PromptPaymentFragment translatable
     new ba94f3a  [wallet] Fix back navigation crash due to duplicated core 
instance
     new db4fbe0  [wallet] products in TransactionInfo seem to be optional now

The 3 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/payment/PayTemplateFragment.kt   | 6 +-----
 wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt  | 2 +-
 wallet/src/main/res/navigation/nav_graph.xml                        | 2 +-
 wallet/src/main/res/values/strings.xml                              | 1 +
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git 
a/wallet/src/main/java/net/taler/wallet/payment/PayTemplateFragment.kt 
b/wallet/src/main/java/net/taler/wallet/payment/PayTemplateFragment.kt
index 64cb2c1..e05d1bd 100644
--- a/wallet/src/main/java/net/taler/wallet/payment/PayTemplateFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/payment/PayTemplateFragment.kt
@@ -25,7 +25,6 @@ import androidx.compose.ui.platform.ComposeView
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.asFlow
-import androidx.navigation.NavOptions
 import androidx.navigation.fragment.findNavController
 import net.taler.common.Amount
 import net.taler.common.showError
@@ -82,10 +81,7 @@ class PayTemplateFragment : Fragment() {
         model.paymentManager.payStatus.observe(viewLifecycleOwner) { payStatus 
->
             when (payStatus) {
                 is PayStatus.Prepared -> {
-                    val navOptions = NavOptions.Builder()
-                        .setPopUpTo(R.id.nav_main, true)
-                        .build()
-                    
findNavController().navigate(R.id.action_promptPayTemplate_to_promptPayment, 
null, navOptions)
+                    
findNavController().navigate(R.id.action_promptPayTemplate_to_promptPayment)
                 }
 
                 is PayStatus.Error -> {
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt 
b/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt
index 536d433..6b1d135 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt
@@ -236,7 +236,7 @@ class TransactionInfo(
     val summary: String,
     @SerialName("summary_i18n")
     val summaryI18n: Map<String, String>? = null,
-    val products: List<ContractProduct>,
+    val products: List<ContractProduct> = emptyList(),
     val fulfillmentUrl: String? = null,
     /**
      * Message shown to the user after the payment is complete.
diff --git a/wallet/src/main/res/navigation/nav_graph.xml 
b/wallet/src/main/res/navigation/nav_graph.xml
index 99f4895..c0bd330 100644
--- a/wallet/src/main/res/navigation/nav_graph.xml
+++ b/wallet/src/main/res/navigation/nav_graph.xml
@@ -87,7 +87,7 @@
     <fragment
         android:id="@+id/promptPayment"
         android:name="net.taler.wallet.payment.PromptPaymentFragment"
-        android:label="Review Payment"
+        android:label="@string/payment_prompt_title"
         tools:layout="@layout/fragment_prompt_payment">
         <action
             android:id="@+id/action_promptPayment_to_nav_main"
diff --git a/wallet/src/main/res/values/strings.xml 
b/wallet/src/main/res/values/strings.xml
index e037055..b35a875 100644
--- a/wallet/src/main/res/values/strings.xml
+++ b/wallet/src/main/res/values/strings.xml
@@ -120,6 +120,7 @@ GNU Taler is immune against many types of fraud, such as 
phishing of credit card
     <string name="transaction_dummy_title">Unknown Transaction</string>
 
     <string name="payment_title">Payment</string>
+    <string name="payment_prompt_title">Review Payment</string>
     <string name="payment_fee">+%s payment fee</string>
     <string name="payment_button_confirm">Confirm Payment</string>
     <string name="payment_label_amount_total">Total Amount:</string>

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