gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-taler-android] branch master updated (ae60909 -> a7d5ebe)


From: gnunet
Subject: [taler-taler-android] branch master updated (ae60909 -> a7d5ebe)
Date: Thu, 10 Sep 2020 20:56:40 +0200

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 ae60909  bump wallet core version
     add cab40e3  [pos] improve error message when fetching the history fails
     add f838c46  [wallet] Fix opening bank confirmation URL
     add 969f847  [wallet] improve log viewer by not updating it and 
pre-filtering
     add a7d5ebe  [wallet] release v0.8.0-rc.2

No new revisions were added by this update.

Summary of changes:
 .../src/main/java/net/taler/merchantpos/history/HistoryFragment.kt    | 3 ++-
 merchant-terminal/src/main/res/values/strings.xml                     | 1 +
 taler-kotlin-android/src/main/java/net/taler/common/AndroidUtils.kt   | 4 +++-
 wallet/build.gradle                                                   | 2 +-
 wallet/src/main/java/net/taler/wallet/settings/SettingsFragment.kt    | 2 +-
 .../net/taler/wallet/transactions/TransactionWithdrawalFragment.kt    | 3 ++-
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git 
a/merchant-terminal/src/main/java/net/taler/merchantpos/history/HistoryFragment.kt
 
b/merchant-terminal/src/main/java/net/taler/merchantpos/history/HistoryFragment.kt
index c7cd8ba..2993177 100644
--- 
a/merchant-terminal/src/main/java/net/taler/merchantpos/history/HistoryFragment.kt
+++ 
b/merchant-terminal/src/main/java/net/taler/merchantpos/history/HistoryFragment.kt
@@ -31,6 +31,7 @@ import net.taler.common.navigate
 import net.taler.common.showError
 import net.taler.merchantlib.OrderHistoryEntry
 import net.taler.merchantpos.MainViewModel
+import net.taler.merchantpos.R
 import net.taler.merchantpos.databinding.FragmentMerchantHistoryBinding
 import 
net.taler.merchantpos.history.HistoryFragmentDirections.Companion.actionGlobalMerchantSettings
 import 
net.taler.merchantpos.history.HistoryFragmentDirections.Companion.actionNavHistoryToRefundFragment
@@ -80,7 +81,7 @@ class HistoryFragment : Fragment(), RefundClickListener {
         })
         historyManager.items.observe(viewLifecycleOwner, { result ->
             when (result) {
-                is HistoryResult.Error -> 
requireActivity().showError(result.msg)
+                is HistoryResult.Error -> 
requireActivity().showError(R.string.error_history, result.msg)
                 is HistoryResult.Success -> 
historyListAdapter.setData(result.items)
             }.exhaustive
         })
diff --git a/merchant-terminal/src/main/res/values/strings.xml 
b/merchant-terminal/src/main/res/values/strings.xml
index bedc486..bee3cd4 100644
--- a/merchant-terminal/src/main/res/values/strings.xml
+++ b/merchant-terminal/src/main/res/values/strings.xml
@@ -67,6 +67,7 @@
     <string name="error_payment">Error: No payment received</string>
     <string name="error_timeout">No payment made within payment period, please 
try again!</string>
     <string name="error_cancelled">Payment cancelled</string>
+    <string name="error_history">Error fetching the order history</string>
 
     <string name="toast_back_to_exit">Click «back» again to exit</string>
 
diff --git 
a/taler-kotlin-android/src/main/java/net/taler/common/AndroidUtils.kt 
b/taler-kotlin-android/src/main/java/net/taler/common/AndroidUtils.kt
index 093194f..4ac2e73 100644
--- a/taler-kotlin-android/src/main/java/net/taler/common/AndroidUtils.kt
+++ b/taler-kotlin-android/src/main/java/net/taler/common/AndroidUtils.kt
@@ -96,9 +96,11 @@ fun Context.isOnline(): Boolean {
     }
 }
 
-fun Context.showLogViewer() {
+fun Context.showLogViewer(logFilter: String? = null) {
     val lynxActivityIntent = LynxActivity.getIntent(this, LynxConfig().apply {
         maxNumberOfTracesToShow = 1500 // higher numbers seem to break share 
functionality
+        samplingRate = Int.MAX_VALUE // no updates please
+        logFilter?.let { filter = it }
     })
     startActivity(lynxActivityIntent)
 }
diff --git a/wallet/build.gradle b/wallet/build.gradle
index a5b2a75..79c24f3 100644
--- a/wallet/build.gradle
+++ b/wallet/build.gradle
@@ -47,7 +47,7 @@ android {
         minSdkVersion 24
         targetSdkVersion 29
         versionCode 8
-        versionName "0.7.1.dev.28"
+        versionName "v0.8.0-rc.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField "String", "WALLET_CORE_VERSION", 
"\"$walletCoreVersion\""
     }
diff --git a/wallet/src/main/java/net/taler/wallet/settings/SettingsFragment.kt 
b/wallet/src/main/java/net/taler/wallet/settings/SettingsFragment.kt
index b321061..d2f30aa 100644
--- a/wallet/src/main/java/net/taler/wallet/settings/SettingsFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/settings/SettingsFragment.kt
@@ -108,7 +108,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
         }
 
         prefLogcat.setOnPreferenceClickListener {
-            requireContext().showLogViewer()
+            requireContext().showLogViewer("taler-wallet")
             true
         }
 
diff --git 
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionWithdrawalFragment.kt
 
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionWithdrawalFragment.kt
index 96782fd..8a45bec 100644
--- 
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionWithdrawalFragment.kt
+++ 
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionWithdrawalFragment.kt
@@ -17,6 +17,7 @@
 package net.taler.wallet.transactions
 
 import android.content.Intent
+import android.content.Intent.ACTION_VIEW
 import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -50,7 +51,7 @@ class TransactionWithdrawalFragment : 
TransactionDetailFragment() {
         if (t.pending && t.withdrawalDetails is 
WithdrawalDetails.TalerBankIntegrationApi &&
             !t.confirmed && t.withdrawalDetails.bankConfirmationUrl != null
         ) {
-            val i = Intent().apply {
+            val i = Intent(ACTION_VIEW).apply {
                 data = Uri.parse(t.withdrawalDetails.bankConfirmationUrl)
             }
             ui.confirmWithdrawalButton.setOnClickListener { 
startActivitySafe(i) }

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]