[taler-taler-android] branch master updated (76572dc -> 716e441)

[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 76572dc  [wallet] release 0.9.3+p7
     new 1f721f5  [wallet] Fix extension and MIME type of exported database 
(JSON -> SQLite3)
     new 9482630  [wallet] Prevent user from interacting with non-contacted 
exchanges
     new df63f3a  [wallet] Fix P2P payments (API changes)
     new 716e441  [wallet] Trim text in URI input fragment

The 4 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:
 wallet/src/main/java/net/taler/wallet/UriInputFragment.kt         | 7 ++++---
 .../src/main/java/net/taler/wallet/exchanges/ExchangeAdapter.kt   | 6 ++++--
 wallet/src/main/java/net/taler/wallet/peer/IncomingState.kt       | 6 ++++--
 wallet/src/main/java/net/taler/wallet/peer/PeerManager.kt         | 8 ++++----
 .../src/main/java/net/taler/wallet/settings/SettingsFragment.kt   | 4 ++--
 wallet/src/main/res/values/strings.xml                            | 1 +
 6 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/wallet/src/main/java/net/taler/wallet/UriInputFragment.kt 
b/wallet/src/main/java/net/taler/wallet/UriInputFragment.kt
index c65c53a..63a46a4 100644
--- a/wallet/src/main/java/net/taler/wallet/UriInputFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/UriInputFragment.kt
@@ -56,10 +56,11 @@ class UriInputFragment : Fragment() {
             }
         }
         ui.okButton.setOnClickListener {
-            if (ui.uriView.text?.startsWith("taler://", ignoreCase = true) == 
true ||
-                ui.uriView.text?.startsWith("payto://", ignoreCase = true) == 
true) {
+            val trimmedText = ui.uriView.text?.trim()
+            if (trimmedText?.startsWith("taler://", ignoreCase = true) == true 
||
+                trimmedText?.startsWith("payto://", ignoreCase = true) == 
true) {
                 ui.uriLayout.error = null
-                launchInAppBrowser(requireContext(), 
ui.uriView.text.toString())
+                launchInAppBrowser(requireContext(), trimmedText.toString())
             } else {
                 ui.uriLayout.error = getString(R.string.uri_invalid)
             }
diff --git a/wallet/src/main/java/net/taler/wallet/exchanges/ExchangeAdapter.kt 
b/wallet/src/main/java/net/taler/wallet/exchanges/ExchangeAdapter.kt
index e0cf5be..6ff97d6 100644
--- a/wallet/src/main/java/net/taler/wallet/exchanges/ExchangeAdapter.kt
+++ b/wallet/src/main/java/net/taler/wallet/exchanges/ExchangeAdapter.kt
@@ -80,8 +80,9 @@ internal class ExchangeAdapter(
 
         fun bind(item: ExchangeItem) {
             urlView.text = item.name
+            // If currency is null, it's because we have no data from the 
exchange...
             currencyView.text = if (item.currency == null) {
-                context.getString(R.string.settings_version_unknown)
+                context.getString(R.string.exchange_not_contacted)
             } else {
                 context.getString(R.string.exchange_list_currency, 
item.currency)
             }
@@ -91,7 +92,8 @@ internal class ExchangeAdapter(
             } else {
                 itemView.setOnClickListener(null)
                 itemView.isClickable = false
-                overflowIcon.visibility = VISIBLE
+                // ...thus, we should prevent the user from interacting with 
it.
+                overflowIcon.visibility = if (item.currency != null) VISIBLE 
else GONE
             }
             overflowIcon.setOnClickListener { openMenu(overflowIcon, item) }
         }
diff --git a/wallet/src/main/java/net/taler/wallet/peer/IncomingState.kt 
b/wallet/src/main/java/net/taler/wallet/peer/IncomingState.kt
index c6c78f3..fffa7bd 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/IncomingState.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/IncomingState.kt
@@ -48,7 +48,8 @@ data class PreparePeerPullDebitResponse(
     val contractTerms: PeerContractTerms,
     val amountRaw: Amount,
     val amountEffective: Amount,
-    val peerPullPaymentIncomingId: String,
+    val peerPullDebitId: String,
+    val transactionId: String,
 )
 
 @Serializable
@@ -56,5 +57,6 @@ data class PreparePeerPushCreditResponse(
     val contractTerms: PeerContractTerms,
     val amountRaw: Amount,
     val amountEffective: Amount,
-    val peerPushPaymentIncomingId: String,
+    val peerPushCreditId: String,
+    val transactionId: String,
 )
diff --git a/wallet/src/main/java/net/taler/wallet/peer/PeerManager.kt 
b/wallet/src/main/java/net/taler/wallet/peer/PeerManager.kt
index 8829cc7..6e65e0b 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/PeerManager.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/PeerManager.kt
@@ -162,7 +162,7 @@ class PeerManager(
                     amountRaw = response.amountRaw,
                     amountEffective = response.amountEffective,
                     contractTerms = response.contractTerms,
-                    id = response.peerPullPaymentIncomingId,
+                    id = response.transactionId,
                 )
             }.onError { error ->
                 Log.e(TAG, "got preparePeerPullDebit error result $error")
@@ -175,7 +175,7 @@ class PeerManager(
         _incomingPullState.value = IncomingAccepting(terms)
         scope.launch(Dispatchers.IO) {
             api.request<Unit>("confirmPeerPullDebit") {
-                put("peerPullPaymentIncomingId", terms.id)
+                put("transactionId", terms.id)
             }.onSuccess {
                 _incomingPullState.value = IncomingAccepted
             }.onError { error ->
@@ -195,7 +195,7 @@ class PeerManager(
                     amountRaw = response.amountRaw,
                     amountEffective = response.amountEffective,
                     contractTerms = response.contractTerms,
-                    id = response.peerPushPaymentIncomingId,
+                    id = response.transactionId,
                 )
             }.onError { error ->
                 Log.e(TAG, "got preparePeerPushCredit error result $error")
@@ -208,7 +208,7 @@ class PeerManager(
         _incomingPushState.value = IncomingAccepting(terms)
         scope.launch(Dispatchers.IO) {
             api.request<Unit>("confirmPeerPushCredit") {
-                put("peerPushPaymentIncomingId", terms.id)
+                put("transactionId", terms.id)
             }.onSuccess {
                 _incomingPushState.value = IncomingAccepted
             }.onError { error ->
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 927d4a9..f5826c9 100644
--- a/wallet/src/main/java/net/taler/wallet/settings/SettingsFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/settings/SettingsFragment.kt
@@ -71,7 +71,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
         settingsManager.exportLogcat(uri)
     }
     private val dbExportLauncher =
-        registerForActivityResult(CreateDocument("application/json")) { uri ->
+        registerForActivityResult(CreateDocument("application/x-sqlite3")) { 
uri ->
             settingsManager.exportDb(uri)
         }
 
@@ -127,7 +127,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
             true
         }
         prefExportDb.setOnPreferenceClickListener {
-            
dbExportLauncher.launch("taler-wallet-db-${currentTimeMillis()}.json")
+            
dbExportLauncher.launch("taler-wallet-db-${currentTimeMillis()}.sql")
             true
         }
 
diff --git a/wallet/src/main/res/values/strings.xml 
b/wallet/src/main/res/values/strings.xml
index b35a875..79b808c 100644
--- a/wallet/src/main/res/values/strings.xml
+++ b/wallet/src/main/res/values/strings.xml
@@ -220,6 +220,7 @@ GNU Taler is immune against many types of fraud, such as 
phishing of credit card
     <string name="exchange_list_empty">No exchanges known\n\nAdd one manually 
or withdraw digital cash!</string>
     <string name="exchange_list_currency">Currency: %s</string>
     <string name="exchange_list_add">Add exchange</string>
+    <string name="exchange_not_contacted">Exchange not contacted</string>
     <string name="exchange_add_url">Enter address of exchange</string>
     <string name="exchange_add_error">Could not add exchange</string>
     <string name="exchange_list_error">Could not list exchanges</string>

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