From b7fba99c7c37d5385696c022931950d205bcb061 Mon Sep 17 00:00:00 2001 From: Monerujo Date: Wed, 21 Apr 2021 18:16:05 +0000 Subject: [PATCH] Rebase to monerujo --- .../com/m2049r/xmrwallet/LoginActivity.java | 42 +++++++ .../com/m2049r/xmrwallet/LoginFragment.java | 4 + .../service/exchange/ecb/ExchangeApiImpl.java | 2 +- app/src/main/res/menu/list_context_menu.xml | 4 + app/src/main/res/values-cat/strings.xml | 5 +- app/src/main/res/values-de/strings.xml | 3 + app/src/main/res/values-el/strings.xml | 5 +- app/src/main/res/values-eo/strings.xml | 5 +- app/src/main/res/values-es/strings.xml | 3 + app/src/main/res/values-et/strings.xml | 5 +- app/src/main/res/values-fr/strings.xml | 3 + app/src/main/res/values-hu/strings.xml | 5 +- app/src/main/res/values-it/strings.xml | 3 + app/src/main/res/values-ja/strings.xml | 5 +- app/src/main/res/values-nb/strings.xml | 5 +- app/src/main/res/values-nl/strings.xml | 3 + app/src/main/res/values-pt-rBR/strings.xml | 5 +- app/src/main/res/values-pt/strings.xml | 5 +- app/src/main/res/values-ro/strings.xml | 5 +- app/src/main/res/values-ru/strings.xml | 119 +++++++++--------- app/src/main/res/values-sk/strings.xml | 3 + app/src/main/res/values-sr/strings.xml | 3 + app/src/main/res/values-sv/strings.xml | 5 +- app/src/main/res/values-uk/strings.xml | 3 + app/src/main/res/values-zh-rCN/strings.xml | 5 +- app/src/main/res/values-zh-rTW/strings.xml | 5 +- app/src/main/res/values/strings.xml | 5 +- doc/BUILDING-external-libs.md | 26 +++- 28 files changed, 216 insertions(+), 75 deletions(-) diff --git a/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java b/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java index b5d1de2..1a660d6 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java +++ b/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java @@ -474,6 +474,7 @@ public class LoginActivity extends BaseActivity @Override public void onWalletBackup(String walletName) { Timber.d("backup for wallet ." + walletName + "."); + // overwrite any pending backup request zipBackup = new ZipBackup(this, walletName); Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT); @@ -500,14 +501,18 @@ public class LoginActivity extends BaseActivity if (data == null) { // nothing selected Toast.makeText(this, getString(R.string.backup_failed), Toast.LENGTH_LONG).show(); + zipBackup = null; return; } try { + if (zipBackup == null) return; // ignore unsolicited request zipBackup.writeTo(data.getData()); Toast.makeText(this, getString(R.string.backup_success), Toast.LENGTH_SHORT).show(); } catch (IOException ex) { Timber.e(ex); Toast.makeText(this, getString(R.string.backup_failed), Toast.LENGTH_LONG).show(); + } finally { + zipBackup = null; } } else if (requestCode == RESTORE_BACKUP_INTENT) { if (data == null) { @@ -557,6 +562,31 @@ public class LoginActivity extends BaseActivity .show(); } + @Override + public void onWalletDeleteCache(final String walletName) { + Timber.d("delete cache for wallet ." + walletName + "."); + if (checkServiceRunning()) return; + DialogInterface.OnClickListener dialogClickListener = (dialog, which) -> { + switch (which) { + case DialogInterface.BUTTON_POSITIVE: + if (!deleteWalletCache(Helper.getWalletFile(LoginActivity.this, walletName))) { + Toast.makeText(LoginActivity.this, getString(R.string.delete_failed), Toast.LENGTH_LONG).show(); + } + break; + case DialogInterface.BUTTON_NEGATIVE: + // do nothing + break; + } + }; + + AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this); + builder.setMessage(getString(R.string.deletecache_alert_message, walletName)) + .setTitle(walletName) + .setPositiveButton(getString(R.string.delete_alert_yes), dialogClickListener) + .setNegativeButton(getString(R.string.delete_alert_no), dialogClickListener) + .show(); + } + void reloadWalletList() { Timber.d("reloadWalletList()"); try { @@ -1024,6 +1054,18 @@ public class LoginActivity extends BaseActivity return success; } + boolean deleteWalletCache(File walletFile) { + Timber.d("deleteWalletCache %s", walletFile.getAbsolutePath()); + File dir = walletFile.getParentFile(); + String name = walletFile.getName(); + boolean success = true; + File cacheFile = new File(dir, name); + if (cacheFile.exists()) { + success = cacheFile.delete(); + } + return success; + } + void copyFile(File src, File dst) throws IOException { try (FileChannel inChannel = new FileInputStream(src).getChannel(); FileChannel outChannel = new FileOutputStream(dst).getChannel()) { diff --git a/app/src/main/java/com/m2049r/xmrwallet/LoginFragment.java b/app/src/main/java/com/m2049r/xmrwallet/LoginFragment.java index 0db596e..34939c8 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/LoginFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/LoginFragment.java @@ -88,6 +88,8 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter void onWalletDelete(String walletName); + void onWalletDeleteCache(String walletName); + void onAddWallet(String type); void onNodePrefs(); @@ -220,6 +222,8 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter activityCallback.onWalletBackup(listItem.getName()); } else if (id == R.id.action_archive) { activityCallback.onWalletDelete(listItem.getName()); + } else if (id == R.id.action_deletecache) { + activityCallback.onWalletDeleteCache(listItem.getName()); } else { return super.onContextItemSelected(item); } diff --git a/app/src/main/java/com/m2049r/xmrwallet/service/exchange/ecb/ExchangeApiImpl.java b/app/src/main/java/com/m2049r/xmrwallet/service/exchange/ecb/ExchangeApiImpl.java index d743a0a..e424a1b 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/service/exchange/ecb/ExchangeApiImpl.java +++ b/app/src/main/java/com/m2049r/xmrwallet/service/exchange/ecb/ExchangeApiImpl.java @@ -167,7 +167,7 @@ public class ExchangeApiImpl implements ExchangeApi { private Calendar fetchDate = null; synchronized private ExchangeRate getRate(String currency) throws ExchangeException { - Timber.e("Getting %s", currency); + Timber.d("Getting %s", currency); final Double rate = fxEntries.get(currency); if (rate == null) throw new ExchangeException(404, "Currency not supported: " + currency); return new ExchangeRateImpl(currency, rate, fxDate.getTime()); diff --git a/app/src/main/res/menu/list_context_menu.xml b/app/src/main/res/menu/list_context_menu.xml index fda24ce..4e78794 100644 --- a/app/src/main/res/menu/list_context_menu.xml +++ b/app/src/main/res/menu/list_context_menu.xml @@ -26,4 +26,8 @@ android:orderInCategory="500" android:title="@string/menu_info" /> + \ No newline at end of file diff --git a/app/src/main/res/values-cat/strings.xml b/app/src/main/res/values-cat/strings.xml index b175cd9..beca823 100644 --- a/app/src/main/res/values-cat/strings.xml +++ b/app/src/main/res/values-cat/strings.xml @@ -417,10 +417,13 @@ Select a subaddress Long-press for details - The wallet will be deleted! + This wallet will be deleted! Delete Delete failed! Import wallet Import failed! + + Reset wallet! + This wallet will be reset, losing all off-chain data (like notes, account & subaddress names, private transaction keys, ...)! Use this ONLY if this wallet is corrupt and does not load! diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 135d0e0..ce871a7 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -424,4 +424,7 @@ Import wallet Import failed! + + Reset wallet! + This wallet will be reset, losing all off-chain data (like notes, account & subaddress names, private transaction keys, ...)! Use this ONLY if this wallet is corrupt and does not load! diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index cad6586..9a85e0a 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -419,10 +419,13 @@ Select a subaddress Long-press for details - The wallet will be deleted! + This wallet will be deleted! Delete Delete failed! Import wallet Import failed! + + Reset wallet! + This wallet will be reset, losing all off-chain data (like notes, account & subaddress names, private transaction keys, ...)! Use this ONLY if this wallet is corrupt and does not load! diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index a94caff..26f9298 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -419,10 +419,13 @@ Select a subaddress Long-press for details - The wallet will be deleted! + This wallet will be deleted! Delete Delete failed! Import wallet Import failed! + + Reset wallet! + This wallet will be reset, losing all off-chain data (like notes, account & subaddress names, private transaction keys, ...)! Use this ONLY if this wallet is corrupt and does not load! diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 2fc326e..309e8bb 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -416,4 +416,7 @@ Import wallet Import failed! + + Reset wallet! + This wallet will be reset, losing all off-chain data (like notes, account & subaddress names, private transaction keys, ...)! Use this ONLY if this wallet is corrupt and does not load! diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index f81d534..95bba30 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -417,10 +417,13 @@ Select a subaddress Long-press for details - The wallet will be deleted! + This wallet will be deleted! Delete Delete failed! Import wallet Import failed! + + Reset wallet! + This wallet will be reset, losing all off-chain data (like notes, account & subaddress names, private transaction keys, ...)! Use this ONLY if this wallet is corrupt and does not load! diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 1f9edc6..29eb342 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -429,4 +429,7 @@ Import wallet Import failed! + + Reset wallet! + This wallet will be reset, losing all off-chain data (like notes, account & subaddress names, private transaction keys, ...)! Use this ONLY if this wallet is corrupt and does not load! diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index c9318ec..1aa0967 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -421,10 +421,13 @@ Select a subaddress Long-press for details - The wallet will be deleted! + This wallet will be deleted! Delete Delete failed! Import wallet Import failed! + + Reset wallet! + This wallet will be reset, losing all off-chain data (like notes, account & subaddress names, private transaction keys, ...)! Use this ONLY if this wallet is corrupt and does not load! diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index b7319cf..d5f41a3 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -428,4 +428,7 @@ Import wallet Import failed! + + Reset wallet! + This wallet will be reset, losing all off-chain data (like notes, account & subaddress names, private transaction keys, ...)! Use this ONLY if this wallet is corrupt and does not load! diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index f561b6c..13e8b59 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -422,10 +422,13 @@ Select a subaddress Long-press for details - The wallet will be deleted! + This wallet will be deleted! Delete Delete failed! Import wallet Import failed! + + Reset wallet! + This wallet will be reset, losing all off-chain data (like notes, account & subaddress names, private transaction keys, ...)! Use this ONLY if this wallet is corrupt and does not load! diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 48e0d87..d30d7ab 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -419,10 +419,13 @@ Select a subaddress Long-press for details - The wallet will be deleted! + This wallet will be deleted! Delete Delete failed! Import wallet Import failed! + + Reset wallet! + This wallet will be reset, losing all off-chain data (like notes, account & subaddress names, private transaction keys, ...)! Use this ONLY if this wallet is corrupt and does not load! diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 434d361..8f9e9ec 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -425,4 +425,7 @@ Import wallet Import failed! + + Reset wallet! + This wallet will be reset, losing all off-chain data (like notes, account & subaddress names, private transaction keys, ...)! Use this ONLY if this wallet is corrupt and does not load! diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 0698828..f43eba7 100755 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -416,10 +416,13 @@ Selecione um subendereço Toque e segure para mais detalhes - The wallet will be deleted! + This wallet will be deleted! Delete Delete failed! Import wallet Import failed! + + Reset wallet! + This wallet will be reset, losing all off-chain data (like notes, account & subaddress names, private transaction keys, ...)! Use this ONLY if this wallet is corrupt and does not load! diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 2910dfb..8cb7a29 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -423,10 +423,13 @@ Select a subaddress Long-press for details - The wallet will be deleted! + This wallet will be deleted! Delete Delete failed! Import wallet Import failed! + + Reset wallet! + This wallet will be reset, losing all off-chain data (like notes, account & subaddress names, private transaction keys, ...)! Use this ONLY if this wallet is corrupt and does not load! diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index b63934c..c09cdd9 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -419,10 +419,13 @@ Selectează o subadresă Atinge lung pentru detalii - The wallet will be deleted! + This wallet will be deleted! Delete Delete failed! Import wallet Import failed! + + Reset wallet! + This wallet will be reset, losing all off-chain data (like notes, account & subaddress names, private transaction keys, ...)! Use this ONLY if this wallet is corrupt and does not load! diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index f76dc40..7b671ad 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -19,8 +19,8 @@ Отлично! В лучших традициях h4x0r! Кошелек - Информация - Ok + О кошельке + Ок Отмена Закрыть Нажмите для доп. информации @@ -135,7 +135,7 @@ + %1$s WOW неподтвержденно - Служба monerujoWOW + Служба Monerujo Синхронизировано: Блоков осталось @@ -164,10 +164,10 @@ Аутентификация по отпечаткам пальцев

С поддержкой аутентификации по отпечаткам пальцев, вы можете просматривать баланс и получать средства без ввода пароля.

-

Но для дополнительной безопасности, monerujoWOW потребует от вас ввести пароль при +

Но для дополнительной безопасности, Monerujo потребует от вас ввести пароль при просмотре деталей кошелька или отправке средств.

Предупреждение системы безопасности -

monerujoWOW хочет напомнить вам, что любой, кто может получить ваш отпечаток пальца, будет +

Monerujo хочет напомнить вам, что любой, кто может получить ваш отпечаток пальца, будет обладать возможностью, заглянуть в баланс вашего кошелька.

Например, злоумышленник может заглянуть в ваш кошелек, когда вы спите.

Вы уверены, что хотите включить эту функцию? @@ -175,7 +175,7 @@ Пароль не совпадает Пароль не может быть пустым Сделайте мне уже кошелек! - Я ввел мнемоническую фразу + Я записал мнемоническую фразу Придумай мне имя! Такой кошелек существует! @@ -256,9 +256,9 @@ Сумма Не удалось открыть кошелек! - Max. %1$s - Min. 0 - Не числовое значение WOW + Макс. %1$s + Мин. 0 + Не числовое значение XMR Сейчас будут показаны конфиденциальные данные. Оглянись вокруг! Я в безопасности @@ -279,8 +279,8 @@ Учетная запись # Отправить все средства на этот счет! - Субадрес - Публичный субадрес #%1$d: %2$s + Подадрес + Публичный подадрес #%1$d: %2$s Язык Использовать язык системы @@ -289,7 +289,7 @@ Подключение к Ledger Требуется подтверждение в Ledger! - Получение субадрессов + Получение подадресов Проверка ключей Занимаюсь сумасшедшей математикой Хеширование материалов @@ -318,7 +318,7 @@ Версия узла несовместима - пожалуйста, обновите! - Информация + Показать ключи Уличный режим Node-o-matiC включен, нажмите для получения дополнительной информации. @@ -361,72 +361,75 @@ Ошибка фразы Ledger! Если вы пытаетесь ввести сюда фразу Ledger, это серьезная угроза для вашей безопасности! - Восстановить высоту + Высота восстановления Запуск приложения WOW на %1$s - Rescan! + Пересканировать! - I get it! - Next - I\'m ready! + Я понял! + Далее + Я готов! - Welcome to monerujoWOW! - This app allows you to create and use WOW wallets. You can store your sweet WOW in them. - Keep your seed safe - The seed grants full access to whoever has it. If you lose it, we cannot help you recover it and you lose your beloved WOW. - Send Crypto - monerujoWOW has SideShift.ai support built-in. Just paste or scan a BTC, LTC, ETH, DASH or DOGE address and you\'ll be sending these cryptos by spending WOW. - Nodes, your way - Nodes connect you to the WOW network. Choose between public nodes or go full cypherpunk using your own. - Send with fingerprint - You\'re now able to send WOW with just your fingerprint if you enabled it. To request the password, just disable fingerprint access. + Добро пожаловать в Monerujo! + Данное приложение позволяет создавать и использовать кошельки Monero. Вы можете хранить ваши сладкие moneroj в них. + Храните свои ключи в безопасности + Секретная фраза дает полный доступ к кошельку. Если вы её потеряете, мы не сможем её восстановить и вы потеряете ваши moneroj. + Отправка других криптовалют + Monerujo имеет поддержку SideShift.ai. Просто вставьте (или просканируйте) адрес BTC, LTC, ETH, DASH или DOGE и вы будете отправлять эти криптовалюты, тратя XMR. + Узлы, узлы, узлы… + Узлы позволяют подключаться к сети Monero. Выбирайте между общедоступными узлами или используйте свой собственный для безопасности IP адреса. + Отправка с помощью отпечатка пальца + Теперь вы можете отправлять XMR с помощью отпечатка пальца, если вы его включили. Чтобы запросить пароль, просто отключите доступ к отпечаткам пальцев. - Dark Mode + Тема - Auto - Day - Night + Автоматически + Светлая (дневная) + Тёмная (ночная) - There is nothing here\nPlease create or restore a wallet + Тут ничего нет\nСоздайте или восстановите кошелек - Restore default nodes - Restoring already in progress… + Восстановить узел по умолчанию + Восстановление уже в процессе… - Last Block: %1$d seconds ago - Last Block: %1$d minutes ago - Last Block: %1$d hours ago - Last Block: %1$d days ago + Последний блок: %1$d секунд назад + Последний блок: %1$d минут назад + Последний блок: %1$d часов назад + Последний блок: %1$d дней назад - Cannot get quote - Check amount and try again + Не могу получить котировку + Проверьте сумму и повторите попытку Ambiguous address.
- Please select the type above. + Двусмысленный адрес.
+ Пожалуйста, выберите тип выше. ]]> Please enter or scan a %1$s address.
- You'll send WOW and the receiver will get %2$s using the SideShift.ai service. + Введите или просканируйте адрес %1$s.
+ Вы отправите XMR, а получатель получит %2$s с помощью серсива SideShift.ai. ]]> Please enter or scan a WOW address. + Введите или просканируйте адрес Monero. ]]> - Subaddresses - Subaddress Name - Too many unused addresses - use some to enable creating more! - Too many unused accounts - use some to enable creating more! - Transactions for this subaddress: - No transactions for this subaddress yet - Select a subaddress - Long-press for details + Подадреса + Имя подадреса + Слишком много неиспользуемых адресов - воспользуйтесь ими, чтобы создать больше! + Слишком много неиспользуемых аккаунтов - воспользуйтесь ими, чтобы включить ещё! + Транзакции данного подадреса: + У данного подадреса нет транзакций + Выбери подадрес + Зажмите и удерживайте для подробностей - Delete - Delete failed! + Удалить кошелек + Ошибка удаления! - Import wallet - Import failed! + Импортировать кошелек + Ошибка импорта! + + Сбросить кошелек + Этот кошелек будет сброшен, вы потеряете все данные, которые не находятся в блокчейне (например примечания, имена подадресов, приватные ключи транзакций, ...)! Используйте это ТОЛЬКО если ваш кошелек поврежден и не загружается! diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index a843758..c5996a4 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -426,4 +426,7 @@ Import wallet Import failed! + + Reset wallet! + This wallet will be reset, losing all off-chain data (like notes, account & subaddress names, private transaction keys, ...)! Use this ONLY if this wallet is corrupt and does not load! diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 9a00bb6..0c7334c 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -424,4 +424,7 @@ Import wallet Import failed! + + Reset wallet! + This wallet will be reset, losing all off-chain data (like notes, account & subaddress names, private transaction keys, ...)! Use this ONLY if this wallet is corrupt and does not load! diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 1fb5477..ea7822d 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -411,10 +411,13 @@ Select a subaddress Long-press for details - The wallet will be deleted! + This wallet will be deleted! Delete Delete failed! Import wallet Import failed! + + Reset wallet! + This wallet will be reset, losing all off-chain data (like notes, account & subaddress names, private transaction keys, ...)! Use this ONLY if this wallet is corrupt and does not load! diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index a67fa4e..c16dca7 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -429,4 +429,7 @@ Import wallet Import failed! + + Reset wallet! + This wallet will be reset, losing all off-chain data (like notes, account & subaddress names, private transaction keys, ...)! Use this ONLY if this wallet is corrupt and does not load! diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index fe6be17..3d93af3 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -343,10 +343,13 @@ Select a subaddress Long-press for details - The wallet will be deleted! + This wallet will be deleted! Delete Delete failed! Import wallet Import failed! + + Reset wallet! + This wallet will be reset, losing all off-chain data (like notes, account & subaddress names, private transaction keys, ...)! Use this ONLY if this wallet is corrupt and does not load! diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 5876f49..8ba96f4 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -418,10 +418,13 @@ Select a subaddress Long-press for details - The wallet will be deleted! + This wallet will be deleted! Delete Delete failed! Import wallet Import failed! + + Reset wallet! + This wallet will be reset, losing all off-chain data (like notes, account & subaddress names, private transaction keys, ...)! Use this ONLY if this wallet is corrupt and does not load! diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f4d297f..ec63778 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -278,7 +278,7 @@ Take me back! Details - The wallet will be deleted! + This wallet will be deleted! Yes, do that! No thanks! @@ -497,4 +497,7 @@ Import wallet Import failed! + + Reset wallet! + This wallet will be reset, losing all off-chain data (like notes, account & subaddress names, private transaction keys, ...)! Use this ONLY if this wallet is corrupt and does not load! diff --git a/doc/BUILDING-external-libs.md b/doc/BUILDING-external-libs.md index ed08ab7..25fe315 100644 --- a/doc/BUILDING-external-libs.md +++ b/doc/BUILDING-external-libs.md @@ -1,3 +1,25 @@ -# BUILDING external libs +# External lib build -Make a symbol link named `monero` to the monero repo (cloned from https://github.com/m2049r/monero) & then `make` in the `external-libs` directory. This builds all binaries using the supplied Dockerfiles so make sure you have docker up and running. +## Requirements: + +1. Docker + +2. `make` (sudo apt install make, little tricky to get it on Windows, https://stackoverflow.com/questions/32127524/how-to-install-and-use-make-in-windows) + +3. Huge amount of RAM and free disk space + +## Building: + +1. Clone https://github.com/m2049r/monero repo. + +2. Change repo to correct branch (example: `git checkout release-v0.17.1.9-monerujo`). + +3. Update submodules: `git submodule update --init --force`. + +4. Then go to folder with xmrwallet repo, then external-libs. Here you need to create symbol link to `monero` folder: + +Linux: `ln -s ~/monero ~/xmrwallet/external-libs/monero` + +Windows: `mklink /D "C:\Users\\xmrwallet\external-libs\monero" "C:\Users\\monero"` + +5. Start Docker and then run `make` in `external-libs` folder. It will fail at end on Windows, but if `wallet2_api.h` exists in `include` folder, the build was successful.