[taler-taler-android] branch master updated (3c42edc -> 39b6926)

[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 3c42edc  Translated using Weblate (German)
     new d4e3fc2  [wallet] Minify release builds and hope for the best
     new da4ad21  [wallet] Remove our custom transaction sorting
     new 39b6926  [wallet] User friendlier p2p insufficient balance error

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:
 wallet/build.gradle                                            |  2 +-
 .../src/main/java/net/taler/wallet/peer/IncomingComposable.kt  | 10 +++++++++-
 .../java/net/taler/wallet/transactions/TransactionManager.kt   |  7 -------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/wallet/build.gradle b/wallet/build.gradle
index d953a02..62a7782 100644
--- a/wallet/build.gradle
+++ b/wallet/build.gradle
@@ -47,7 +47,7 @@ android {
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles 
getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
         debug {
diff --git a/wallet/src/main/java/net/taler/wallet/peer/IncomingComposable.kt 
b/wallet/src/main/java/net/taler/wallet/peer/IncomingComposable.kt
index 0c118e6..1ce0175 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/IncomingComposable.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/IncomingComposable.kt
@@ -48,6 +48,8 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import net.taler.common.Amount
 import net.taler.wallet.R
+import 
net.taler.wallet.backend.TalerErrorCode.WALLET_PEER_PULL_PAYMENT_INSUFFICIENT_BALANCE
+import 
net.taler.wallet.backend.TalerErrorCode.WALLET_PEER_PUSH_PAYMENT_INSUFFICIENT_BALANCE
 import net.taler.wallet.backend.TalerErrorCode.WALLET_WITHDRAWAL_KYC_REQUIRED
 import net.taler.wallet.backend.TalerErrorInfo
 
@@ -187,11 +189,17 @@ fun ColumnScope.PeerPullTermsComposable(
 
 @Composable
 fun ColumnScope.PeerPullErrorComposable(s: IncomingError) {
+    val message = when (s.info.code) {
+        WALLET_PEER_PULL_PAYMENT_INSUFFICIENT_BALANCE -> 
stringResource(R.string.payment_balance_insufficient)
+        WALLET_PEER_PUSH_PAYMENT_INSUFFICIENT_BALANCE -> 
stringResource(R.string.payment_balance_insufficient)
+        else -> s.info.userFacingMsg
+    }
+
     Text(
         modifier = Modifier
             .align(CenterHorizontally)
             .padding(horizontal = 32.dp),
-        text = s.info.userFacingMsg,
+        text = message,
         style = MaterialTheme.typography.headlineSmall,
         color = MaterialTheme.colorScheme.error,
     )
diff --git 
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt 
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt
index edd2912..534ed6c 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt
@@ -78,13 +78,6 @@ class TransactionManager(
             mProgress.postValue(false)
         }.onSuccess { result ->
             val transactions = LinkedList(result.transactions)
-            // TODO remove when fixed in wallet-core
-            val comparator = compareBy<Transaction>(
-                { it.txState.major == Pending },
-                { it.timestamp.ms },
-                { it.transactionId }
-            )
-            transactions.sortWith(comparator)
             transactions.reverse() // show latest first
 
             mProgress.value = false

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