diff --git a/app/build.gradle b/app/build.gradle index 533145f3..550ea14f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,12 +4,12 @@ android { ndkVersion '17.2.4988734' defaultConfig { applicationId "com.m2049r.xmrwallet" - buildToolsVersion = '34.0.0' - compileSdk 34 + buildToolsVersion = '35.0.0' + compileSdk 35 minSdkVersion 21 targetSdkVersion 35 - versionCode 4005 - versionName "4.0.5 'Sidekick'" + versionCode 4006 + versionName "4.0.6 'Sidekick'" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" externalNativeBuild { cmake { diff --git a/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java b/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java index a167f3e6..465442d7 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java +++ b/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java @@ -1413,6 +1413,11 @@ public class LoginActivity extends BaseActivity } catch (ClassCastException ex) { // ignore it } + if (connectedDeviceName != null) { + setSubtitle(getString(R.string.sidekick_connected)); + } else { + setSubtitle(null); + } } @Override diff --git a/app/src/main/java/com/m2049r/xmrwallet/NodeFragment.java b/app/src/main/java/com/m2049r/xmrwallet/NodeFragment.java index bab74a77..3701da6d 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/NodeFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/NodeFragment.java @@ -289,8 +289,7 @@ public class NodeFragment extends Fragment } else if (params[0] == SCAN) { // otherwise scan the network Timber.d("scanning"); - Set seedList = new HashSet<>(); - seedList.addAll(nodeList); + Set seedList = new HashSet<>(nodeList); nodeList.clear(); Timber.d("seed %d", seedList.size()); Dispatcher d = new Dispatcher(info -> publishProgress(info)); diff --git a/app/src/main/java/com/m2049r/xmrwallet/data/DefaultNodes.java b/app/src/main/java/com/m2049r/xmrwallet/data/DefaultNodes.java index 367d1959..0b94315f 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/data/DefaultNodes.java +++ b/app/src/main/java/com/m2049r/xmrwallet/data/DefaultNodes.java @@ -19,23 +19,26 @@ package com.m2049r.xmrwallet.data; import lombok.AllArgsConstructor; import lombok.Getter; -// Nodes stolen from https://moneroworld.com/#nodes - +@Getter @AllArgsConstructor public enum DefaultNodes { - MONERUJO("nodex.monerujo.io:18081"), - XMRTO("node.xmr.to:18081"), - SUPPORTXMR("node.supportxmr.com:18081"), - HASHVAULT("nodes.hashvault.pro:18081"), - MONEROWORLD("node.moneroworld.com:18089"), - XMRTW("opennode.xmr-tw.org:18089"), - ds_jetzt("monero.ds-jetzt.de:18089"), - MONERUJO_ONION("monerujods7mbghwe6cobdr6ujih6c22zu5rl7zshmizz2udf7v7fsad.onion:18081/mainnet/monerujo.onion"), - Criminales78("56wl7y2ebhamkkiza4b7il4mrzwtyvpdym7bm2bkg3jrei2je646k3qd.onion:18089/mainnet/Criminales78.onion"), - xmrfail("mxcd4577fldb3ppzy7obmmhnu3tf57gbcbd4qhwr2kxyjj2qi3dnbfqd.onion:18081/mainnet/xmrfail.onion"), + AGORIST("xmr.agor.ist:18089/mainnet/agor.ist"), + BOLDSUCK("xmr-de.boldsuck.org:18080/mainnet/boldsuck.org"), boldsuck("6dsdenp6vjkvqzy4wzsnzn6wixkdzihx3khiumyzieauxuxslmcaeiad.onion:18081/mainnet/boldsuck.onion"), - ds_jetzt_onion("qvlr4w7yhnjrdg3txa72jwtpnjn4ezsrivzvocbnvpfbdo342fahhoad.onion:18089/mainnet/ds-jetzt.onion"); + CAKE("xmr-node.cakewallet.com:18081/mainnet/cakewallet.com"), + DS_JETZT("monero.ds-jetzt.de:18089/mainnet/ds-jetzt.de"), + ds_jetzt("qvlr4w7yhnjrdg3txa72jwtpnjn4ezsrivzvocbnvpfbdo342fahhoad.onion:18089/mainnet/ds-jetzt.onion"), + MONERODEVS("node.monerodevs.org:18089/mainnet/monerodevs.org"), + MONERUJO("nodex.monerujo.io:18081/mainnet/monerujo.io"), + monerujo("monerujods7mbghwe6cobdr6ujih6c22zu5rl7zshmizz2udf7v7fsad.onion:18081/mainnet/monerujo.onion"), + SETH("node.sethforprivacy.com:18089/mainnet/sethforprivacy.com"), + seth("sfpp2p7wnfjv3lrvfan4jmmkvhnbsbimpa3cqyuf7nt6zd24xhcqcsyd.onion/mainnet/sethforprivacy.onion"), + STACK("monero.stackwallet.com:18081/mainnet/stackwallet.com"), + STORMYCLOUD("xmr.stormycloud.org:18089/mainnet/stormycloud.org"), + TENZ("monero.10z.com.ar:18089/mainnet/10z.com.ar"), + XMRROCKS("node.xmr.rocks:18089/mainnet/xmr.rocks"), + xmrrocks("xqnnz2xmlmtpy2p4cm4cphg2elkwu5oob7b7so5v4wwgt44p6vbx5ryd.onion/mainnet/xmr.rocks.onion"), + XMRTW("opennode.xmr-tw.org:18089/mainnet/xmr-tw.org"); - @Getter private final String uri; } diff --git a/app/src/main/java/com/m2049r/xmrwallet/data/Node.java b/app/src/main/java/com/m2049r/xmrwallet/data/Node.java index be77c0cd..d0b49009 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/data/Node.java +++ b/app/src/main/java/com/m2049r/xmrwallet/data/Node.java @@ -144,7 +144,7 @@ public class Node { if ((nodeString == null) || nodeString.isEmpty()) throw new IllegalArgumentException("daemon is empty"); String daemonAddress; - String a[] = nodeString.split("@"); + String[] a = nodeString.split("@"); if (a.length == 1) { // no credentials daemonAddress = a[0]; username = ""; @@ -169,7 +169,7 @@ public class Node { throw new IllegalArgumentException("Too many '/' or too few"); daemonAddress = daParts[0]; - String da[] = daemonAddress.split(":"); + String[] da = daemonAddress.split(":"); if ((da.length > 2) || (da.length < 1)) throw new IllegalArgumentException("Too many ':' or too few"); String host = da[0]; diff --git a/app/src/main/res/values-cat/strings.xml b/app/src/main/res/values-cat/strings.xml index 804d592d..d5805e50 100644 --- a/app/src/main/res/values-cat/strings.xml +++ b/app/src/main/res/values-cat/strings.xml @@ -448,6 +448,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -460,4 +463,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 78a6fb0a..26e4af13 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -449,6 +449,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -461,4 +464,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 855b3477..8368f2d5 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -450,6 +450,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -462,4 +465,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index bd4b49a1..3df9c9d7 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -448,6 +448,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -460,4 +463,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 8f8de438..58a52bc6 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -445,6 +445,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -457,4 +460,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 9100252f..18781ad0 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -448,6 +448,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -460,4 +463,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 96a5e719..f72b09cc 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -688,6 +688,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -700,4 +703,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 905b6c86..ffc8ec59 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -461,6 +461,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -473,4 +476,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 5bf905d9..7fd67c33 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -448,6 +448,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -460,4 +463,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 9fb4ac1d..df1378a8 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -452,6 +452,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -464,4 +467,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index f4b88c5f..4666a31f 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -453,6 +453,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -465,4 +468,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index c305f355..75460c7d 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -453,6 +453,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -465,4 +468,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 80453eac..c3708547 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -448,6 +448,9 @@ APPLY + Connect Sidekick + Select Sidekick device + Lock Wallet in Background Bluetooth permissions are required to connect your Sidekick Wallet! @@ -462,4 +465,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 59f0449c..125de001 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -450,6 +450,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -462,4 +465,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 189354e1..2d129751 100755 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -443,6 +443,9 @@ aqui. Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -455,4 +458,5 @@ aqui. to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 31e58f05..e53a74dd 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -454,6 +454,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -466,4 +469,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index a98b2f61..f5231822 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -450,6 +450,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -462,4 +465,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index af38c4bf..996270f4 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -454,6 +454,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -466,4 +469,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index bac5fd26..8218e61d 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -451,6 +451,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -463,4 +466,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index e09c8291..bb33ca36 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -449,6 +449,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -461,4 +464,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 7fdb0e7b..9061d8c7 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -442,6 +442,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -454,4 +457,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 6a0abb25..14aa7b5c 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -448,6 +448,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -460,4 +463,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 64c482dd..55d6d358 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -454,6 +454,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -466,4 +469,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 3fdae218..9ed83d19 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -375,6 +375,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -387,4 +390,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 37a6fa68..b9c57588 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -449,6 +449,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -461,4 +464,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a4bd751b..5b53af83 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -510,20 +510,9 @@ Lock Wallet in Background - Sidekick Wallet - monerujo Sidekick Service - - Bluetooth not connected - Paired Devices - Other Devices - Scan - None paired - None found - Select Device Bluetooth - Connect Sidekick - Select Sidekick device - Scanning for devices + Connect Sidekick + Select Sidekick device Bluetooth permissions are required to connect your Sidekick Wallet! OK @@ -537,4 +526,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected