summaryrefslogtreecommitdiff
path: root/wallet/src
diff options
context:
space:
mode:
authorTorsten Grote <t@grobox.de>2022-06-20 14:12:24 -0300
committerTorsten Grote <t@grobox.de>2022-06-20 14:12:24 -0300
commit0450b57c2d2104226196878a9e7217fe6eb3730e (patch)
treebdb498f62fb17b651effdda1df8038f3817564f2 /wallet/src
parent5b7bb5cf012fc41b2fbb6a41f6f858009c1ba092 (diff)
downloadtaler-android-0450b57c2d2104226196878a9e7217fe6eb3730e.tar.gz
taler-android-0450b57c2d2104226196878a9e7217fe6eb3730e.tar.bz2
taler-android-0450b57c2d2104226196878a9e7217fe6eb3730e.zip
Fix lint and CI issues
Note that I only fixes the most grave things that made things fail. I didn't address all issues introduces lately nor making sure the targetSdk bump to 32 has no unintented side-effects.
Diffstat (limited to 'wallet/src')
-rw-r--r--wallet/src/main/AndroidManifest.xml1
-rw-r--r--wallet/src/main/res/values-fr/strings.xml4
-rw-r--r--wallet/src/test/java/net/taler/wallet/withdraw/WithdrawManagerKtTest.kt13
3 files changed, 8 insertions, 10 deletions
diff --git a/wallet/src/main/AndroidManifest.xml b/wallet/src/main/AndroidManifest.xml
index 61191b6..70d2c4f 100644
--- a/wallet/src/main/AndroidManifest.xml
+++ b/wallet/src/main/AndroidManifest.xml
@@ -17,6 +17,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
diff --git a/wallet/src/main/res/values-fr/strings.xml b/wallet/src/main/res/values-fr/strings.xml
index 0394a81..7d260a6 100644
--- a/wallet/src/main/res/values-fr/strings.xml
+++ b/wallet/src/main/res/values-fr/strings.xml
@@ -7,10 +7,6 @@
\n
\nhttps://bank.demo.taler.net</string>
<string name="withdraw_error_message">Pour l\'instant il n\'est pas possible de retirer. Veuillez réessayer plus tard !</string>
- <plurals name="exchange_fee_coin">
- <item quantity="one">Monnaie : %s (utilisée %d fois)</item>
- <item quantity="other">Monnaie : %s (utilisée %d fois)</item>
- </plurals>
<string name="settings_dev_mode">Mode développeur</string>
<string name="menu_settings">Réglages</string>
<string name="settings_reset">Réinitialiser le portefeuille (dangereux!)</string>
diff --git a/wallet/src/test/java/net/taler/wallet/withdraw/WithdrawManagerKtTest.kt b/wallet/src/test/java/net/taler/wallet/withdraw/WithdrawManagerKtTest.kt
index 519082c..b75e8bf 100644
--- a/wallet/src/test/java/net/taler/wallet/withdraw/WithdrawManagerKtTest.kt
+++ b/wallet/src/test/java/net/taler/wallet/withdraw/WithdrawManagerKtTest.kt
@@ -16,8 +16,7 @@
package net.taler.wallet.withdraw
-import android.net.Uri
-import net.taler.common.Amount
+import Bech32.Companion.generateFakeSegwitAddress
import org.junit.Assert
import org.junit.Test
@@ -25,7 +24,8 @@ class WithdrawManagerKtTest {
@Test
fun generateMainnet() {
- val (addr1, addr2) = generateFakeSegwitAddress("54ZN9AMVN1R0YZ68ZPVHHQA4KZE1V037M05FNMYH4JQ596YAKJEG", "bc1qar0srrr7xfkvy5l643lydnw9re59gtzzwf5mdq")
+ val (addr1, addr2) = generateFakeSegwitAddress("54ZN9AMVN1R0YZ68ZPVHHQA4KZE1V037M05FNMYH4JQ596YAKJEG",
+ "bc1qar0srrr7xfkvy5l643lydnw9re59gtzzwf5mdq")
Assert.assertEquals(addr1, "bc1q9yl4f23f8a224xagwq8hej8akuvd63yl8nyedj")
Assert.assertEquals(addr2, "bc1q4yl4f2kurkqx0gq2ltfazf9w2jdu48yaqlghnp")
@@ -33,7 +33,8 @@ class WithdrawManagerKtTest {
@Test
fun generateTestnet() {
- val (addr1, addr2) = generateFakeSegwitAddress("54ZN9AMVN1R0YZ68ZPVHHQA4KZE1V037M05FNMYH4JQ596YAKJEG", "tb1qhxrhccqexg0dv4nltgkuw4fg2ce7muplmjsn0v")
+ val (addr1, addr2) = generateFakeSegwitAddress("54ZN9AMVN1R0YZ68ZPVHHQA4KZE1V037M05FNMYH4JQ596YAKJEG",
+ "tb1qhxrhccqexg0dv4nltgkuw4fg2ce7muplmjsn0v")
Assert.assertEquals(addr1, "tb1q9yl4f23f8a224xagwq8hej8akuvd63yld4l2kp")
Assert.assertEquals(addr2, "tb1q4yl4f2kurkqx0gq2ltfazf9w2jdu48ya2enygj")
@@ -41,10 +42,10 @@ class WithdrawManagerKtTest {
@Test
fun generateRegnet() {
- val (addr1, addr2) = generateFakeSegwitAddress("54ZN9AMVN1R0YZ68ZPVHHQA4KZE1V037M05FNMYH4JQ596YAKJEG", "bcrtqhxrhccqexg0dv4nltgkuw4fg2ce7muplmjsn0v")
+ val (addr1, addr2) = generateFakeSegwitAddress("54ZN9AMVN1R0YZ68ZPVHHQA4KZE1V037M05FNMYH4JQ596YAKJEG",
+ "bcrtqhxrhccqexg0dv4nltgkuw4fg2ce7muplmjsn0v")
Assert.assertEquals(addr1, "bcrt1q9yl4f23f8a224xagwq8hej8akuvd63yl0ux8pg")
Assert.assertEquals(addr2, "bcrt1q4yl4f2kurkqx0gq2ltfazf9w2jdu48yags2flm")
-
}
}