[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-android] 06/06: [wallet] show different withdrawal error me
From: |
gnunet |
Subject: |
[taler-taler-android] 06/06: [wallet] show different withdrawal error message when app is offline |
Date: |
Thu, 03 Sep 2020 18:42:03 +0200 |
This is an automated email from the git hooks/post-receive script.
torsten-grote pushed a commit to branch master
in repository taler-android.
commit ce5a1d2476b1a344b881dd92840934925aedd394
Author: Torsten Grote <t@grobox.de>
AuthorDate: Thu Sep 3 13:38:59 2020 -0300
[wallet] show different withdrawal error message when app is offline
---
wallet/src/main/java/net/taler/wallet/withdraw/ErrorFragment.kt | 7 ++++++-
wallet/src/main/res/values/strings.xml | 2 ++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/ErrorFragment.kt
b/wallet/src/main/java/net/taler/wallet/withdraw/ErrorFragment.kt
index 8b4ca9d..14389c4 100644
--- a/wallet/src/main/java/net/taler/wallet/withdraw/ErrorFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/withdraw/ErrorFragment.kt
@@ -25,6 +25,7 @@ import android.view.ViewGroup
import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels
import androidx.navigation.fragment.findNavController
+import net.taler.common.isOnline
import net.taler.wallet.MainViewModel
import net.taler.wallet.R
import net.taler.wallet.databinding.FragmentErrorBinding
@@ -48,7 +49,11 @@ class ErrorFragment : Fragment() {
super.onViewCreated(view, savedInstanceState)
ui.errorTitle.setText(R.string.withdraw_error_title)
- ui.errorMessage.setText(R.string.withdraw_error_message)
+ if (requireContext().isOnline()) {
+ ui.errorMessage.setText(R.string.withdraw_error_message)
+ } else {
+ ui.errorMessage.setText(R.string.offline)
+ }
// show dev error message if dev mode is on
val status = withdrawManager.withdrawStatus.value
diff --git a/wallet/src/main/res/values/strings.xml
b/wallet/src/main/res/values/strings.xml
index a780ad3..d49f5f7 100644
--- a/wallet/src/main/res/values/strings.xml
+++ b/wallet/src/main/res/values/strings.xml
@@ -54,6 +54,8 @@ GNU Taler is immune against many types of fraud, such as
phishing of credit card
<string name="menu">Menu</string>
<string name="or">or</string>
+ <string name="offline">Operation requires internet access. Please ensure
your internet connection works and try again.</string>
+
<string name="menu_settings">Settings</string>
<string name="menu_retry_pending_operations">Retry Pending
Operations</string>
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-android] branch master updated (36821f9 -> ce5a1d2), gnunet, 2020/09/03
- [taler-taler-android] 01/06: Don't crash on empty manual withdrawal amount, gnunet, 2020/09/03
- [taler-taler-android] 02/06: [cashier] migrate to view binding as kotlin extensions are broken, gnunet, 2020/09/03
- [taler-taler-android] 06/06: [wallet] show different withdrawal error message when app is offline,
gnunet <=
- [taler-taler-android] 05/06: [pos] make app work on API 24+, gnunet, 2020/09/03
- [taler-taler-android] 03/06: [pos] migrate to view binding, gnunet, 2020/09/03
- [taler-taler-android] 04/06: [wallet] migrate away from kotlin view extensions, gnunet, 2020/09/03