bump version

update to monero v0.17.3.2
upgrade build files
2025-09-04 00:53:36 +02:00 · 2022-05-15 17:25:28 +02:00 · 2022-05-15 17:24:54 +02:00 · 2022-05-15 15:57:11 +02:00 · 2022-05-01 11:51:49 +02:00 · 2022-05-01 11:44:52 +02:00
32 changed files with 60 additions and 54 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
        applicationId "com.m2049r.xmrwallet"
        minSdkVersion 21
        targetSdkVersion 31
-        versionCode 1401
-        versionName "2.4.1 'Baldaŭ'"
+        versionCode 1402
+        versionName "2.4.2 'Baldaŭ'"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        externalNativeBuild {
            cmake {
@@ -111,6 +111,7 @@ android {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
    }
+    namespace 'com.m2049r.xmrwallet'
 }

 static def getId(name) {
@@ -129,7 +130,7 @@ dependencies {
    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
    implementation 'androidx.preference:preference:1.2.0'

-    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'com.google.android.material:material:1.6.0'

    implementation 'me.dm7.barcodescanner:zxing:1.9.8'
    implementation "com.squareup.okhttp3:okhttp:4.9.3"
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.m2049r.xmrwallet">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">

    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
--- a/app/src/main/java/com/btchip/comm/android/BTChipTransportAndroidHID.java
+++ b/app/src/main/java/com/btchip/comm/android/BTChipTransportAndroidHID.java
@@ -78,7 +78,7 @@ public class BTChipTransportAndroidHID implements BTChipTransport {
    }

    private static final int VID = 0x2C97;
-    private static final int[] PID_HIDS = {0x0001, 0x0004};
+    private static final int[] PID_HIDS = {0x0001, 0x0004, 0x0005};

    private UsbDeviceConnection connection;
    private UsbInterface dongleInterface;
--- a/app/src/main/java/com/m2049r/xmrwallet/NodeFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/NodeFragment.java
@@ -415,7 +415,14 @@ public class NodeFragment extends Fragment
            }
            etNodeHost.setError(null);
            nodeInfo.setRpcPort(port);
-            nodeInfo.setName(etNodeName.getEditText().getText().toString().trim());
+            // setName() may trigger reverse DNS
+            Helper.runWithNetwork(new Helper.Action() {
+                @Override
+                public boolean run() {
+                    nodeInfo.setName(etNodeName.getEditText().getText().toString().trim());
+                    return true;
+                }
+            });
            nodeInfo.setUsername(etNodeUser.getEditText().getText().toString().trim());
            nodeInfo.setPassword(etNodePass.getEditText().getText().toString()); // no trim for pw
            return true;
--- a/app/src/main/res/values-cat/strings.xml
+++ b/app/src/main/res/values-cat/strings.xml
@@ -290,7 +290,7 @@
    <string name="menu_language">Idioma</string>
    <string name="language_system_default">Utilitzar Idioma del Sistema</string>

-    <string name="fab_restore_ledger">Restablir desde Ledger Nano S</string>
+    <string name="fab_restore_ledger">Restablir desde Ledger Nano</string>

    <string name="progress_ledger_progress">Comunicant amb Ledger</string>
    <string name="progress_ledger_confirm">Es requereix confirmació en Ledger!</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -286,7 +286,7 @@
    <string name="menu_language">Sprache</string>
    <string name="language_system_default">Benutze Systemsprache</string>

-    <string name="fab_restore_ledger">Wallet mit Ledger Nano S wiederherstellen</string>
+    <string name="fab_restore_ledger">Wallet mit Ledger Nano wiederherstellen</string>

    <string name="progress_ledger_progress">Kommunikation mit Ledger</string>
    <string name="progress_ledger_confirm">Bestätigung auf Ledger benötigt!</string>
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -283,7 +283,7 @@
    <string name="menu_language">Language</string>
    <string name="language_system_default">Use System Language</string>

-    <string name="fab_restore_ledger">Restore from Ledger Nano S</string>
+    <string name="fab_restore_ledger">Restore from Ledger Nano</string>

    <string name="progress_ledger_progress">Communicating with Ledger</string>
    <string name="progress_ledger_confirm">Confirmation on Ledger required!</string>
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -290,7 +290,7 @@
    <string name="menu_language">Lingvo</string>
    <string name="language_system_default">Uzi la sistemlingvon</string>

-    <string name="fab_restore_ledger">Restaŭri de Ledger Nano S</string>
+    <string name="fab_restore_ledger">Restaŭri de Ledger Nano</string>

    <string name="progress_ledger_progress">Komunikante kun Ledger</string>
    <string name="progress_ledger_confirm">Konfirmo je la Ledger estas postulita!</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -273,7 +273,7 @@
    <string name="menu_language">Lenguaje</string>
    <string name="language_system_default">Usar Idioma del Sistema</string>

-    <string name="fab_restore_ledger">Restaurar desde Ledger Nano S</string>
+    <string name="fab_restore_ledger">Restaurar desde Ledger Nano</string>

    <string name="progress_ledger_progress">Comunicándose con Ledger</string>
    <string name="progress_ledger_confirm">¡Confirmación en Ledger requerida!</string>
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -285,7 +285,7 @@
    <string name="menu_language">Keel</string>
    <string name="language_system_default">Kasuta süsteemi keelt</string>

-    <string name="fab_restore_ledger">Taasta seadmelt Ledger Nano S</string>
+    <string name="fab_restore_ledger">Taasta seadmelt Ledger Nano</string>

    <string name="progress_ledger_progress">Suhtlen seadmega Ledger</string>
    <string name="progress_ledger_confirm">Seadmelt Ledger on vajalik kinnitus!</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -284,7 +284,7 @@
    <string name="tx_subaddress">Sous-adresse</string>
    <string name="generate_address_label_sub">Sous-adresse publique #%1$d: %2$s</string>

-    <string name="fab_restore_ledger">Restaurer depuis Ledger Nano S</string>
+    <string name="fab_restore_ledger">Restaurer depuis Ledger Nano</string>

    <string name="progress_ledger_progress">Communication avec Ledger</string>
    <string name="progress_ledger_confirm">Confirmation requise sur Ledger !</string>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -283,7 +283,7 @@
    <string name="menu_language">Nyelv</string>
    <string name="language_system_default">Rendszernyelv használata</string>

-    <string name="fab_restore_ledger">Visszaállítás Ledger Nano S-ről</string>
+    <string name="fab_restore_ledger">Visszaállítás Ledger Nano-ről</string>

    <string name="progress_ledger_progress">Kommunikáció a Ledgerrel</string>
    <string name="progress_ledger_confirm">Ledgeren való megerősítés szükséges!</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -286,7 +286,7 @@
    <string name="menu_language">Lingua</string>
    <string name="language_system_default">Usa lingua di sistema</string>

-    <string name="fab_restore_ledger">Ripristina da Ledger Nano S</string>
+    <string name="fab_restore_ledger">Ripristina da Ledger Nano</string>

    <string name="progress_ledger_progress">In comunicazione con Ledger</string>
    <string name="progress_ledger_confirm">Conferma su Ledger richiesta!</string>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -289,7 +289,7 @@
    <string name="menu_language">言語</string>
    <string name="language_system_default">システムの言語を使う</string>

-    <string name="fab_restore_ledger">レッジャーナノSから復元</string>
+    <string name="fab_restore_ledger">レッジャーナノから復元</string>

    <string name="progress_ledger_progress">レッジャーと通信中</string>
    <string name="progress_ledger_confirm">レッジャーでの承認が必要です!</string>
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -283,7 +283,7 @@
    <string name="menu_language">Language</string>
    <string name="language_system_default">Use System Language</string>

-    <string name="fab_restore_ledger">Restore from Ledger Nano S</string>
+    <string name="fab_restore_ledger">Restore from Ledger Nano</string>

    <string name="progress_ledger_progress">Communicating with Ledger</string>
    <string name="progress_ledger_confirm">Confirmation on Ledger required!</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -281,7 +281,7 @@
    <string name="menu_language">Taal</string>
    <string name="language_system_default">Systeemtaal gebruiken</string>

-    <string name="fab_restore_ledger">Herstellen met Ledger Nano S</string>
+    <string name="fab_restore_ledger">Herstellen met Ledger Nano</string>

    <string name="progress_ledger_progress">Communiceren met Ledger…</string>
    <string name="progress_ledger_confirm">Bevestiging op Ledger vereist!</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -282,7 +282,7 @@
    <string name="menu_language">Idioma</string>
    <string name="language_system_default">Usar o idioma do sistema</string>

-    <string name="fab_restore_ledger">Restaurar da Ledger Nano S</string>
+    <string name="fab_restore_ledger">Restaurar da Ledger Nano</string>

    <string name="progress_ledger_progress">Comunicando com a Ledger</string>
    <string name="progress_ledger_confirm">Necessária confirmação na Ledger!</string>
@@ -422,13 +422,13 @@ aqui.</string>
    <string name="menu_deletecache">Resetar carteira!</string>
    <string name="deletecache_alert_message"><![CDATA[Esta carteira será resetada, perdendo todos os dados "off-chain" (como notas, contas & nomes de subendereços, chaves de transações privadas, …)! Use isso SOMENTE se esta carteira estiver corrompida e não carrega!]]></string>

-    <string name="node_tor_error">Tor required</string>
-    <string name="node_waiting">\u00A0WAITING FOR NODE\u00A0</string>
-    <string name="tor_enable_background">"Allow Background Starts" in Orbot Settings to use Tor!</string>
+    <string name="node_tor_error">Necessário Tor</string>
+    <string name="node_waiting">\u00A0ESPERANDO PELO NÓ\u00A0</string>
+    <string name="tor_enable_background">"Permitir inicializações em segundo plano" nas opções do Orbot para usar o Tor!</string>
    <string name="tor_noshift">SideShift.ai doesn\'t support Tor.\nDisable Tor to swap XMR.</string>

-    <string name="label_seed_offset_encrypt">Seed encryption (EXPERIMENTAL)</string>
-    <string name="seed_offset_hint">Seed Offset Phrase (optional)</string>
+    <string name="label_seed_offset_encrypt">Encriptação da Semente (EXPERIMENTAL)</string>
+    <string name="seed_offset_hint">Senha de dedução da semente (opcional)</string>

    <string name="menu_settings">Settings</string>
    <string name="title_iface">Interface</string> <!-- like: User Intreface -->
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -285,7 +285,7 @@
    <string name="menu_language">Linguagem</string>
    <string name="language_system_default">Usar linguagem de sistema</string>

-    <string name="fab_restore_ledger">Restaurar de Ledger Nano S</string>
+    <string name="fab_restore_ledger">Restaurar de Ledger Nano</string>

    <string name="progress_ledger_progress">A comunicar com o Ledger</string>
    <string name="progress_ledger_confirm">Confirmação com Ledger necessária!</string>
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -283,7 +283,7 @@
    <string name="menu_language">Limbă</string>
    <string name="language_system_default">De sistem</string>

-    <string name="fab_restore_ledger">Recuperează cu Ledger Nano S</string>
+    <string name="fab_restore_ledger">Recuperează cu Ledger Nano</string>

    <string name="progress_ledger_progress">Comunicare cu Ledger</string>
    <string name="progress_ledger_confirm">Confirmare necesară în Ledger!</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -285,7 +285,7 @@
    <string name="menu_language">Язык</string>
    <string name="language_system_default">Использовать язык системы</string>

-    <string name="fab_restore_ledger">Восстановление из Ledger Nano S</string>
+    <string name="fab_restore_ledger">Восстановление из Ledger Nano</string>

    <string name="progress_ledger_progress">Подключение к Ledger</string>
    <string name="progress_ledger_confirm">Требуется подтверждение в Ledger!</string>
@@ -438,19 +438,19 @@
    <string name="tor_enable_background">Необходимо выбрать "Allow Background Starts" в настройках Orbot для использования Tor!</string>
    <string name="tor_noshift">SideShift.ai не поддерживает Tor.\nОтключите Tor для обмена XMR.</string>

-    <string name="label_seed_offset_encrypt">Seed encryption (EXPERIMENTAL)</string>
-    <string name="seed_offset_hint">Seed Offset Phrase (optional)</string>
+    <string name="label_seed_offset_encrypt">Шифрование фразы (ЭКСПЕРЕМЕНТАЛЬНО)</string>
+    <string name="seed_offset_hint">Смещение фразы (необязательно)</string>

-    <string name="menu_settings">Settings</string>
-    <string name="title_iface">Interface</string> <!-- like: User Intreface -->
-    <string name="title_info">Information</string>
-    <string name="setting_daynight">Day / Night</string>
+    <string name="menu_settings">Настройки</string>
+    <string name="title_iface">Интерфейс</string> <!-- like: User Intreface -->
+    <string name="title_info">Информация</string>
+    <string name="setting_daynight">Дневная / Ночная</string>

-    <string name="setting_theme">Style</string>
+    <string name="setting_theme">Стиль</string>
    <string-array name="themes">
-        <item>Classic</item>
+        <item>Классический</item>
        <item>Baldaŭ</item> <!-- do not translate this one -->
    </string-array>

-    <string name="message_qr_failed">Failed to create QR for sharing!</string>
+    <string name="message_qr_failed">Не удалось создать QR!</string>
 </resources>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -282,7 +282,7 @@
    <string name="menu_language">Jazyk</string>
    <string name="language_system_default">Použi jazyk systému</string>

-    <string name="fab_restore_ledger">Obnoviť z Ledger Nano S</string>
+    <string name="fab_restore_ledger">Obnoviť z Ledger Nano</string>

    <string name="progress_ledger_progress">Komunikácia s Ledger</string>
    <string name="progress_ledger_confirm">Vyžaduje potvrdenie na Ledgeri!</string>
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -292,7 +292,7 @@
    <string name="menu_language">Jezik</string>
    <string name="language_system_default">Koristi sistemski jezik</string>

-    <string name="fab_restore_ledger">Povrati iz knjige računa nano S</string>
+    <string name="fab_restore_ledger">Povrati iz knjige računa nano</string>

    <string name="progress_ledger_progress">Komunikacija sa knjigom računa</string>
    <string name="progress_ledger_confirm">Potrebna potvrda iz knjige računa!</string>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -274,7 +274,7 @@
    <string name="menu_language">Språk</string>
    <string name="language_system_default">Använd systemets språk</string>

-    <string name="fab_restore_ledger">Återställ från Ledger Nano S</string>
+    <string name="fab_restore_ledger">Återställ från Ledger Nano</string>

    <string name="progress_ledger_progress">Kommunicerar med Ledger</string>
    <string name="progress_ledger_confirm">Bekräfta på Ledger!</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -285,7 +285,7 @@
    <string name="menu_language">Мова</string>
    <string name="language_system_default">Використовувати мову системи</string>

-    <string name="fab_restore_ledger">Відновлення з Ledger Nano S</string>
+    <string name="fab_restore_ledger">Відновлення з Ledger Nano</string>

    <string name="progress_ledger_progress">Підключення до Ledger</string>
    <string name="progress_ledger_confirm">Необхідне підтвердження в Ledger!</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -224,7 +224,7 @@
    <string name="generate_address_label_sub">公开子地址#%1$d: %2$s</string>
    <string name="menu_language">语言</string>
    <string name="language_system_default">使用系统默认语言</string>
-    <string name="fab_restore_ledger">通过Ledger Nano S恢复</string>
+    <string name="fab_restore_ledger">通过Ledger Nano 恢复</string>
    <string name="progress_ledger_progress">与Ledger通信中</string>
    <string name="progress_ledger_confirm">请在Ledger设备上确认！</string>
    <string name="progress_ledger_lookahead">子地址检索中</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -281,7 +281,7 @@
    <string name="menu_language">語言</string>
    <string name="language_system_default">使用系統語言</string>

-    <string name="fab_restore_ledger">從 Ledger Nano S 回復錢包</string>
+    <string name="fab_restore_ledger">從 Ledger Nano 回復錢包</string>

    <string name="progress_ledger_progress">與 Ledger 錢包傳輸資料中</string>
    <string name="progress_ledger_confirm">請在 Ledger 裝置上確認此操作！</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -338,7 +338,7 @@
    <string name="menu_language">Language</string>
    <string name="language_system_default">Use System Language</string>

-    <string name="fab_restore_ledger">Restore from Ledger Nano S</string>
+    <string name="fab_restore_ledger">Restore from Ledger Nano</string>

    <string name="progress_ledger_progress">Communicating with Ledger</string>
    <string name="progress_ledger_confirm">Confirmation on Ledger required!</string>
--- a/app/src/main/res/xml/usb_device_filter.xml
+++ b/app/src/main/res/xml/usb_device_filter.xml
@@ -11,4 +11,9 @@
        product-id="4"
        vendor-id="11415" />

+    <!-- Ledger Nano S Plus HID: VID=0x2C97 PID=0x0005 -->
+    <usb-device
+        product-id="5"
+        vendor-id="11415" />
+
 </resources>
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
        google()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:7.2.0'
    }
 }

--- a/external-libs/VERSION
+++ b/external-libs/VERSION
@@ -1 +1 @@
-MONERUJO_monero feature_theme_v2 with monero release-v0.17.3.0-monerujo
+MONERUJO_monero master with monero release-v0.17.3.2-monerujo
--- a/external-libs/include/wallet2_api.h
+++ b/external-libs/include/wallet2_api.h
@@ -790,7 +790,7 @@ struct Wallet
    /**
     * @brief makeMultisig - switches wallet in multisig state. The one and only creation phase for N / N wallets
     * @param info - vector of multisig infos from other participants obtained with getMulitisInfo call
-     * @param threshold - number of required signers to make valid transaction. Must be equal to number of participants (N) or N - 1
+     * @param threshold - number of required signers to make valid transaction. Must be <= number of participants
     * @return in case of N / N wallets returns empty string since no more key exchanges needed. For N - 1 / N wallets returns base58 encoded extra multisig info
     */
    virtual std::string makeMultisig(const std::vector<std::string>& info, uint32_t threshold) = 0;
@@ -800,12 +800,6 @@ struct Wallet
     * @return new info string if more rounds required or an empty string if wallet creation is done
     */
    virtual std::string exchangeMultisigKeys(const std::vector<std::string> &info) = 0;
-    /**
-     * @brief finalizeMultisig - finalizes N - 1 / N multisig wallets creation
-     * @param extraMultisigInfo - wallet participants' extra multisig info obtained with makeMultisig call
-     * @return true if success
-     */
-    virtual bool finalizeMultisig(const std::vector<std::string>& extraMultisigInfo) = 0;
    /**
     * @brief exportMultisigImages - exports transfers' key images
     * @param images - output paramter for hex encoded array of images
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
Author	SHA1	Message	Date
m2049r	5d489a634b	bump version	2022-05-15 17:25:28 +02:00
m2049r	59b6f484fd	update to monero v0.17.3.2	2022-05-15 17:24:54 +02:00
m2049r	ecaa49d67d	upgrade build files	2022-05-15 15:57:11 +02:00
jont4	d2dc53599e	Update PT-rBR strings (#813 ) * Update pt-rBR * Update app/src/main/res/values-pt-rBR/strings.xml Co-authored-by: netrik182 <30935310+netrik182@users.noreply.github.com> * Update app/src/main/res/values-pt-rBR/strings.xml Co-authored-by: netrik182 <30935310+netrik182@users.noreply.github.com> * Update strings.xml fix as suggested Co-authored-by: jontaix <31804298+jontaix@users.noreply.github.com> Co-authored-by: netrik182 <30935310+netrik182@users.noreply.github.com> Co-authored-by: m2049r <m2049r@monerujo.io>	2022-05-01 11:51:49 +02:00
Лапки	4d8b26f97f	Update strings.xml (#826 )	2022-05-01 11:44:52 +02:00
Justin Berman	581c76e7be	setName uses async network helper in case of reverse DNS lookup (#818 , #827 ) (#828 )	2022-05-01 11:44:27 +02:00
AnonimaUzanto	6f66862870	Adding support for Ledger Nano S Plus (#832 )	2022-05-01 11:35:01 +02:00