[taler-taler-android] branch master updated (e350d49 -> 88fd7c5)

[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 e350d49  [wallet] implement prototype for handling incoming pay-pull 
URI
     new e91eeba  [cashier] exclude encrypted settings from backup
     new 83f0b43  [cashier] disable timeout when showing QR code
     new 88fd7c5  [cashier] Release v0.2

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:
 cashier/build.gradle                                     |  4 ++--
 cashier/src/main/AndroidManifest.xml                     |  1 +
 .../main/java/net/taler/cashier/config/ConfigManager.kt  |  3 ++-
 .../net/taler/cashier/withdraw/TransactionFragment.kt    | 14 +++++++-------
 .../java/net/taler/cashier/withdraw/WithdrawManager.kt   | 16 ++++++++--------
 cashier/src/main/res/xml/backup_descriptor.xml           |  3 ++-
 cashier/src/main/res/xml/data_extraction_rules.xml       |  6 ++++++
 7 files changed, 28 insertions(+), 19 deletions(-)
 create mode 100644 cashier/src/main/res/xml/data_extraction_rules.xml

diff --git a/cashier/build.gradle b/cashier/build.gradle
index ab495a4..7d5116a 100644
--- a/cashier/build.gradle
+++ b/cashier/build.gradle
@@ -30,8 +30,8 @@ android {
         applicationId "net.taler.cashier"
         minSdkVersion 23
         targetSdkVersion 32
-        versionCode 1
-        versionName "0.1"
+        versionCode 2
+        versionName "0.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/cashier/src/main/AndroidManifest.xml 
b/cashier/src/main/AndroidManifest.xml
index dec5940..398e545 100644
--- a/cashier/src/main/AndroidManifest.xml
+++ b/cashier/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
 
     <application
         android:allowBackup="true"
+        android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_descriptor"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/cashier/src/main/java/net/taler/cashier/config/ConfigManager.kt 
b/cashier/src/main/java/net/taler/cashier/config/ConfigManager.kt
index d850d27..c79fd12 100644
--- a/cashier/src/main/java/net/taler/cashier/config/ConfigManager.kt
+++ b/cashier/src/main/java/net/taler/cashier/config/ConfigManager.kt
@@ -55,7 +55,7 @@ private val TAG = ConfigManager::class.java.simpleName
 class ConfigManager(
     private val app: Application,
     private val scope: CoroutineScope,
-    private val httpClient: HttpClient
+    private val httpClient: HttpClient,
 ) {
 
     val configDestination = 
ConfigFragmentDirections.actionGlobalConfigFragment()
@@ -112,6 +112,7 @@ class ConfigManager(
             mConfigResult.postValue(result)
         }
     }
+
     private suspend fun checkConfig(config: Config) = 
withContext(Dispatchers.IO) {
         val url = "${config.bankUrl}/integration-api/config"
         Log.d(TAG, "Checking config: $url")
diff --git 
a/cashier/src/main/java/net/taler/cashier/withdraw/TransactionFragment.kt 
b/cashier/src/main/java/net/taler/cashier/withdraw/TransactionFragment.kt
index ffb1539..0f606b8 100644
--- a/cashier/src/main/java/net/taler/cashier/withdraw/TransactionFragment.kt
+++ b/cashier/src/main/java/net/taler/cashier/withdraw/TransactionFragment.kt
@@ -50,21 +50,21 @@ class TransactionFragment : Fragment() {
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         ui = FragmentTransactionBinding.inflate(inflater, container, false)
         return ui.root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        withdrawManager.withdrawAmount.observe(viewLifecycleOwner, { amount ->
+        withdrawManager.withdrawAmount.observe(viewLifecycleOwner) { amount ->
             ui.amountView.text = amount?.toString()
-        })
-        withdrawManager.withdrawResult.observe(viewLifecycleOwner, { result ->
+        }
+        withdrawManager.withdrawResult.observe(viewLifecycleOwner) { result ->
             onWithdrawResultReceived(result)
-        })
-        withdrawManager.withdrawStatus.observe(viewLifecycleOwner, { status ->
+        }
+        withdrawManager.withdrawStatus.observe(viewLifecycleOwner) { status ->
             onWithdrawStatusChanged(status)
-        })
+        }
 
         // change intro text depending on whether NFC is available or not
         val hasNfc = NfcManager.hasNfc(requireContext())
diff --git 
a/cashier/src/main/java/net/taler/cashier/withdraw/WithdrawManager.kt 
b/cashier/src/main/java/net/taler/cashier/withdraw/WithdrawManager.kt
index 601b59a..c6c39d0 100644
--- a/cashier/src/main/java/net/taler/cashier/withdraw/WithdrawManager.kt
+++ b/cashier/src/main/java/net/taler/cashier/withdraw/WithdrawManager.kt
@@ -38,17 +38,15 @@ import net.taler.common.Amount
 import net.taler.common.QrCodeManager.makeQrCode
 import net.taler.common.isOnline
 import org.json.JSONObject
-import java.util.concurrent.TimeUnit.MINUTES
 import java.util.concurrent.TimeUnit.SECONDS
 
 private val TAG = WithdrawManager::class.java.simpleName
 
 private val INTERVAL = SECONDS.toMillis(1)
-private val TIMEOUT = MINUTES.toMillis(2)
 
 class WithdrawManager(
     private val app: Application,
-    private val viewModel: MainViewModel
+    private val viewModel: MainViewModel,
 ) {
     private val scope
         get() = viewModel.viewModelScope
@@ -83,7 +81,7 @@ class WithdrawManager(
         if (balanceResult !is BalanceResult.Success) return false
         return try {
             balanceResult.amount.positive && amount <= 
balanceResult.amount.amount
-        } catch (e : IllegalStateException) {
+        } catch (e: IllegalStateException) {
             Log.e(TAG, "Error comparing amounts", e)
             null
         }
@@ -128,7 +126,7 @@ class WithdrawManager(
         }
     }
 
-    private val timer: CountDownTimer = object : CountDownTimer(TIMEOUT, 
INTERVAL) {
+    private val timer: CountDownTimer = object : 
CountDownTimer(Long.MAX_VALUE, INTERVAL) {
         override fun onTick(millisUntilFinished: Long) {
             val result = withdrawResult.value
             if (result is WithdrawResult.Success) {
@@ -155,7 +153,8 @@ class WithdrawManager(
     }
 
     private fun checkWithdrawStatus(withdrawalId: String) = 
scope.launch(Dispatchers.IO) {
-        val url = 
"${config.bankUrl}/access-api/accounts/${config.username}/withdrawals/${withdrawalId}"
+        val url =
+            
"${config.bankUrl}/access-api/accounts/${config.username}/withdrawals/${withdrawalId}"
         Log.d(TAG, "Checking withdraw status at $url")
         val response = makeJsonGetRequest(url, config)
         if (response !is Success) return@launch  // ignore errors and continue 
trying
@@ -206,7 +205,8 @@ class WithdrawManager(
     }
 
     private fun abort(withdrawalId: String) = scope.launch(Dispatchers.IO) {
-        val url = 
"${config.bankUrl}/access-api/accounts/${config.username}/withdrawals/${withdrawalId}/abort"
+        val url =
+            
"${config.bankUrl}/access-api/accounts/${config.username}/withdrawals/${withdrawalId}/abort"
         Log.d(TAG, "Aborting withdrawal at $url")
         makeJsonPostRequest(url, JSONObject(), config)
     }
@@ -263,5 +263,5 @@ sealed class WithdrawStatus {
 
 data class LastTransaction(
     val withdrawAmount: Amount,
-    val withdrawStatus: WithdrawStatus
+    val withdrawStatus: WithdrawStatus,
 )
diff --git a/cashier/src/main/res/xml/backup_descriptor.xml 
b/cashier/src/main/res/xml/backup_descriptor.xml
index a298494..c5d3bc7 100644
--- a/cashier/src/main/res/xml/backup_descriptor.xml
+++ b/cashier/src/main/res/xml/backup_descriptor.xml
@@ -15,5 +15,6 @@
   -->
 
 <full-backup-content>
-
+    <!-- will not be able to decrypt this, causing crash -->
+    <exclude domain="sharedpref" path="secret_settings.xml"/>
 </full-backup-content>
diff --git a/cashier/src/main/res/xml/data_extraction_rules.xml 
b/cashier/src/main/res/xml/data_extraction_rules.xml
new file mode 100644
index 0000000..de53be5
--- /dev/null
+++ b/cashier/src/main/res/xml/data_extraction_rules.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data-extraction-rules>
+    <cloud-backup>
+        <exclude domain="sharedpref" path="secret_settings.xml"/>
+    </cloud-backup>
+</data-extraction-rules>

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