bump version

* Update translation files

Updated by "Cleanup translation files" add-on in Weblate.

Translation: monerujo/App - Main
Translate-URL: https://hosted.weblate.org/projects/monerujo/app-main/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 88.4% (329 of 372 strings)

Translation: monerujo/App - Main
Translate-URL: https://hosted.weblate.org/projects/monerujo/app-main/pt_BR/

* Update translation files

Updated by "Cleanup translation files" add-on in Weblate.

Translation: monerujo/App - Help
Translate-URL: https://hosted.weblate.org/projects/monerujo/app-help/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 75.0% (15 of 20 strings)

Translation: monerujo/App - Help
Translate-URL: https://hosted.weblate.org/projects/monerujo/app-help/pt_BR/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (5 of 5 strings)

Translation: monerujo/App - About
Translate-URL: https://hosted.weblate.org/projects/monerujo/app-about/pt_BR/

* Translated using Weblate (Spanish)

Currently translated at 95.1% (354 of 372 strings)

Translation: monerujo/App - Main
Translate-URL: https://hosted.weblate.org/projects/monerujo/app-main/es/

* Translated using Weblate (Spanish)

Currently translated at 80.0% (4 of 5 strings)

Translation: monerujo/App - About
Translate-URL: https://hosted.weblate.org/projects/monerujo/app-about/es/

* Translated using Weblate (Spanish)

Currently translated at 95.0% (19 of 20 strings)

Translation: monerujo/App - Help
Translate-URL: https://hosted.weblate.org/projects/monerujo/app-help/es/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (5 of 5 strings)

Translation: monerujo/App - About
Translate-URL: https://hosted.weblate.org/projects/monerujo/app-about/pt_BR/

* Translated using Weblate (French)

Currently translated at 100.0% (372 of 372 strings)

Translation: monerujo/App - Main
Translate-URL: https://hosted.weblate.org/projects/monerujo/app-main/fr/

* Translated using Weblate (Turkish)

Currently translated at 100.0% (372 of 372 strings)

Translation: monerujo/App - Main
Translate-URL: https://hosted.weblate.org/projects/monerujo/app-main/tr/

* Translated using Weblate (Turkish)

Currently translated at 100.0% (372 of 372 strings)

Translation: monerujo/App - Main
Translate-URL: https://hosted.weblate.org/projects/monerujo/app-main/tr/

* Added translation using Weblate (Greek)

* Added translation using Weblate (Serbian)

* Added translation using Weblate (Estonian)

* Added translation using Weblate (Serbian)

* Translated using Weblate (French)

Currently translated at 100.0% (5 of 5 strings)

Translation: monerujo/App - About
Translate-URL: https://hosted.weblate.org/projects/monerujo/app-about/fr/

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (20 of 20 strings)

Translation: monerujo/App - Help
Translate-URL: https://hosted.weblate.org/projects/monerujo/app-help/uk/

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (372 of 372 strings)

Translation: monerujo/App - Main
Translate-URL: https://hosted.weblate.org/projects/monerujo/app-main/uk/

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (20 of 20 strings)

Translation: monerujo/App - Help
Translate-URL: https://hosted.weblate.org/projects/monerujo/app-help/uk/

* Translated using Weblate (Tamil)

Currently translated at 100.0% (20 of 20 strings)

Translation: monerujo/App - Help
Translate-URL: https://hosted.weblate.org/projects/monerujo/app-help/ta/

* Translated using Weblate (Tamil)

Currently translated at 100.0% (372 of 372 strings)

Translation: monerujo/App - Main
Translate-URL: https://hosted.weblate.org/projects/monerujo/app-main/ta/

* Translated using Weblate (Tamil)

Currently translated at 100.0% (20 of 20 strings)

Translation: monerujo/App - Help
Translate-URL: https://hosted.weblate.org/projects/monerujo/app-help/ta/

* Translated using Weblate (French)

Currently translated at 100.0% (20 of 20 strings)

Translation: monerujo/App - Help
Translate-URL: https://hosted.weblate.org/projects/monerujo/app-help/fr/

* Address build errors

We can remove translations since Weblate will just tag as them 'previously translated', and they're broken so what can we do

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (20 of 20 strings)

Translation: monerujo/App - Help
Translate-URL: https://hosted.weblate.org/projects/monerujo/app-help/uk/

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (20 of 20 strings)

Translation: monerujo/App - Help
Translate-URL: https://hosted.weblate.org/projects/monerujo/app-help/uk/

* Translated using Weblate (Ukrainian)

Currently translated at 100.0% (20 of 20 strings)

Translation: monerujo/App - Help
Translate-URL: https://hosted.weblate.org/projects/monerujo/app-help/uk/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (372 of 372 strings)

Translation: monerujo/App - Main
Translate-URL: https://hosted.weblate.org/projects/monerujo/app-main/pt_BR/

* Translated using Weblate (Russian)

Currently translated at 94.8% (353 of 372 strings)

Translation: monerujo/App - Main
Translate-URL: https://hosted.weblate.org/projects/monerujo/app-main/ru/

* Translated using Weblate (Russian)

Currently translated at 100.0% (372 of 372 strings)

Translation: monerujo/App - Main
Translate-URL: https://hosted.weblate.org/projects/monerujo/app-main/ru/

* Added translation using Weblate (Czech)

* Added translation using Weblate (Czech)

* Added translation using Weblate (Czech)

* Translated using Weblate (Czech)

Currently translated at 80.0% (4 of 5 strings)

Translation: monerujo/App - About
Translate-URL: https://hosted.weblate.org/projects/monerujo/app-about/cs/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (372 of 372 strings)

Translation: monerujo/App - Main
Translate-URL: https://hosted.weblate.org/projects/monerujo/app-main/pt_BR/

* Translated using Weblate (French)

Currently translated at 100.0% (20 of 20 strings)

Translation: monerujo/Help page
Translate-URL: https://hosted.weblate.org/projects/monerujo/app/app-help/fr/

* Translated using Weblate (German)

Currently translated at 80.0% (16 of 20 strings)

Translation: monerujo/Help page
Translate-URL: https://hosted.weblate.org/projects/monerujo/app/app-help/de/

* Translated using Weblate (German)

Currently translated at 97.3% (362 of 372 strings)

Translation: monerujo/Main strings
Translate-URL: https://hosted.weblate.org/projects/monerujo/app/app-main/de/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (20 of 20 strings)

Translation: monerujo/Help page
Translate-URL: https://hosted.weblate.org/projects/monerujo/app/app-help/pt_BR/

---------

Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Co-authored-by: John Doe <thraex@numericable.fr>
Co-authored-by: Languages add-on <noreply-addon-languages@weblate.org>
Co-authored-by: Максим Горпиніч <maksimgorpinic2005a@gmail.com>
Co-authored-by: தமிழ்நேரம் <anishprabu.t@gmail.com>
Co-authored-by: Yurt Page <yurtpage@gmail.com>
Co-authored-by: Fjuro <fjuro@alius.cz>
Co-authored-by: tetic frisbook <tetic90548@frisbook.com>

.circleci/config.yml

@@ -3,13 +3,11 @@ jobs:
   build:
     working_directory: ~/code
     docker:
-      - image: circleci/android:api-28-ndk
+      - image: cimg/android:2023.12-ndk
     environment:
       JVM_OPTS: -Xmx3200m
     steps:
       - checkout
-      - run: yes | sdkmanager --licenses || exit 0
-      - run: yes | sdkmanager --update || exit 0
       - restore_cache:
           key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
       - run:

.gitignore

@@ -8,9 +8,9 @@
 .DS_Store
 /app/build
 /app/release
-/app/alpha
-/app/prod
-/app/alphaMainnet
-/app/prodMainnet
-/app/alphaStagenet
-/app/prodStagenet
+/app/alpha*
+/app/prod*
+/app/.cxx
+/monerujo.id
+/external-libs/VERSION
+/external-libs/include/wallet2_api.h

README.md

@@ -15,28 +15,33 @@ Another Android Monero Wallet for Monero
 - Advanced users can copy over synced wallet files (all files) onto sdcard in directory Monerujo (created first time App is started)
 - See the [FAQ](doc/FAQ.md)
 
-## Translations
-Help us translate Monerujo! You can find instructions [On Taiga](https://taiga.getmonero.org/project/erciccione-monero-localization/wiki/monerujo), and if you need help/support, open an issue or contact the Localization Workgroup. You can find us on the freenode channel `#monero-translations`, also relayed on [MatterMost](https://mattermost.getmonero.org/monero/channels/monero-translations), and matrix/riot.
+## Translation
+If you'd like to help translate Monerujo, take a look at our [Weblate project!](https://hosted.weblate.org/engage/monerujo/)
+Thank you so much for your help!
+
+<a href="https://hosted.weblate.org/engage/monerujo/">
+<img src="https://hosted.weblate.org/widget/monerujo/multi-auto.svg" alt="Translation status" />
+</a>
 
 ### Disclaimer
-You may lose all your Moneroj if you use this App. Be cautious when spending on the mainnet.
+You may lose all your Monero if you use this App. Be cautious when spending on the mainnet.
 
 ### Random Notes
-- works on the mainnet & stagenet
-- use your own daemon - it's easy
+- Works on the mainnet & stagenet
+- Use your own daemon - it's easy
 - Monerujo means "Monero Wallet" according to https://www.reddit.com/r/Monero/comments/3exy7t/esperanto_corner/
 
 ### TODO
-- see taiga.getmonero.org & issues on github
+- See taiga.getmonero.org & issues on github
 
 ### Issues / Pitfalls
 - Users of Zenfone MAX & Zenfone 2 Laser (possibly others) **MUST** use the armeabi-v7a APK as the arm64-v8a build uses hardware AES
-functionality these models don't have.
+  functionality these models don't have.
 - You should backup your wallet files in the "monerujo" folder periodically.
 - Also note, that on some devices the backups will only be visible on a PC over USB after a reboot of the device (it's an Android bug/feature)
 - Created wallets on a private testnet are unusable because the restore height is set to that
-of the "real" testnet.  After creating a new wallet, make a **new** one by recovering from the seed.
-The official monero client shows the same behaviour.
+  of the "real" testnet.  After creating a new wallet, make a **new** one by recovering from the seed.
+  The official monero client shows the same behaviour.
 
 ### HOW TO BUILD
 

app/CMakeLists.txt

@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 3.4.1)
+project(monerujo)
 message(STATUS ABI_INFO  = ${ANDROID_ABI})
 
 add_library( monerujo
@@ -13,7 +14,7 @@ set(EXTERNAL_LIBS_DIR ${CMAKE_SOURCE_DIR}/../external-libs)
 
 add_library(sodium STATIC IMPORTED)
 set_target_properties(sodium PROPERTIES IMPORTED_LOCATION
-        ${EXTERNAL_LIBS_DIR}/libsodium/lib/${ANDROID_ABI}/libsodium.a)
+        ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/libsodium.a)
 
 ############
 # OpenSSL
@@ -21,11 +22,11 @@ set_target_properties(sodium PROPERTIES IMPORTED_LOCATION
 
 add_library(crypto STATIC IMPORTED)
 set_target_properties(crypto PROPERTIES IMPORTED_LOCATION
-        ${EXTERNAL_LIBS_DIR}/openssl/lib/${ANDROID_ABI}/libcrypto.a)
+        ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/libcrypto.a)
 
 add_library(ssl STATIC IMPORTED)
 set_target_properties(ssl PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/openssl/lib/${ANDROID_ABI}/libssl.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/libssl.a)
 
 ############
 # Boost
@@ -33,39 +34,39 @@ set_target_properties(ssl PROPERTIES IMPORTED_LOCATION
 
 add_library(boost_chrono STATIC IMPORTED)
 set_target_properties(boost_chrono PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/boost/lib/${ANDROID_ABI}/libboost_chrono.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/libboost_chrono.a)
 
 add_library(boost_date_time STATIC IMPORTED)
 set_target_properties(boost_date_time PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/boost/lib/${ANDROID_ABI}/libboost_date_time.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/libboost_date_time.a)
 
 add_library(boost_filesystem STATIC IMPORTED)
 set_target_properties(boost_filesystem PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/boost/lib/${ANDROID_ABI}/libboost_filesystem.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/libboost_filesystem.a)
 
 add_library(boost_program_options STATIC IMPORTED)
 set_target_properties(boost_program_options PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/boost/lib/${ANDROID_ABI}/libboost_program_options.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/libboost_program_options.a)
 
 add_library(boost_regex STATIC IMPORTED)
 set_target_properties(boost_regex PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/boost/lib/${ANDROID_ABI}/libboost_regex.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/libboost_regex.a)
 
 add_library(boost_serialization STATIC IMPORTED)
 set_target_properties(boost_serialization PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/boost/lib/${ANDROID_ABI}/libboost_serialization.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/libboost_serialization.a)
 
 add_library(boost_system STATIC IMPORTED)
 set_target_properties(boost_system PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/boost/lib/${ANDROID_ABI}/libboost_system.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/libboost_system.a)
 
 add_library(boost_thread STATIC IMPORTED)
 set_target_properties(boost_thread PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/boost/lib/${ANDROID_ABI}/libboost_thread.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/libboost_thread.a)
 
 add_library(boost_wserialization STATIC IMPORTED)
 set_target_properties(boost_wserialization PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/boost/lib/${ANDROID_ABI}/libboost_wserialization.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/libboost_wserialization.a)
 
 #############
 # Monero
@@ -73,79 +74,107 @@ set_target_properties(boost_wserialization PROPERTIES IMPORTED_LOCATION
 
 add_library(wallet_api STATIC IMPORTED)
 set_target_properties(wallet_api PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libwallet_api.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libwallet_api.a)
 
 add_library(wallet STATIC IMPORTED)
 set_target_properties(wallet PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libwallet.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libwallet.a)
 
 add_library(cryptonote_core STATIC IMPORTED)
 set_target_properties(cryptonote_core PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libcryptonote_core.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libcryptonote_core.a)
 
 add_library(cryptonote_basic STATIC IMPORTED)
 set_target_properties(cryptonote_basic PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libcryptonote_basic.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libcryptonote_basic.a)
 
 add_library(mnemonics STATIC IMPORTED)
 set_target_properties(mnemonics PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libmnemonics.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libmnemonics.a)
 
 add_library(common STATIC IMPORTED)
 set_target_properties(common PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libcommon.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libcommon.a)
 
 add_library(cncrypto STATIC IMPORTED)
 set_target_properties(cncrypto PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libcncrypto.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libcncrypto.a)
 
 add_library(ringct STATIC IMPORTED)
 set_target_properties(ringct PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libringct.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libringct.a)
 
 add_library(ringct_basic STATIC IMPORTED)
 set_target_properties(ringct_basic PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libringct_basic.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libringct_basic.a)
 
 add_library(blockchain_db STATIC IMPORTED)
 set_target_properties(blockchain_db PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libblockchain_db.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libblockchain_db.a)
 
 add_library(lmdb STATIC IMPORTED)
 set_target_properties(lmdb PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/liblmdb.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/liblmdb.a)
 
 add_library(easylogging STATIC IMPORTED)
 set_target_properties(easylogging PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libeasylogging.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libeasylogging.a)
 
 add_library(unbound STATIC IMPORTED)
 set_target_properties(unbound PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libunbound.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/libunbound.a)
 
 add_library(epee STATIC IMPORTED)
 set_target_properties(epee PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libepee.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libepee.a)
 
 add_library(blocks STATIC IMPORTED)
 set_target_properties(blocks PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libblocks.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libblocks.a)
 
 add_library(checkpoints STATIC IMPORTED)
 set_target_properties(checkpoints PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libcheckpoints.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libcheckpoints.a)
 
 add_library(device STATIC IMPORTED)
 set_target_properties(device PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libdevice.a)
+        ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libdevice.a)
+
+add_library(device_trezor STATIC IMPORTED)
+set_target_properties(device_trezor PROPERTIES IMPORTED_LOCATION
+        ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libdevice_trezor.a)
 
 add_library(multisig STATIC IMPORTED)
 set_target_properties(multisig PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libmultisig.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libmultisig.a)
 
 add_library(version STATIC IMPORTED)
 set_target_properties(version PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libversion.a)
+    ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libversion.a)
+
+add_library(net STATIC IMPORTED)
+set_target_properties(net PROPERTIES IMPORTED_LOCATION
+        ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libnet.a)
+
+add_library(hardforks STATIC IMPORTED)
+set_target_properties(hardforks PROPERTIES IMPORTED_LOCATION
+        ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libhardforks.a)
+
+add_library(randomx STATIC IMPORTED)
+set_target_properties(randomx PROPERTIES IMPORTED_LOCATION
+        ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/librandomx.a)
+
+add_library(rpc_base STATIC IMPORTED)
+set_target_properties(rpc_base PROPERTIES IMPORTED_LOCATION
+        ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/librpc_base.a)
+
+add_library(wallet-crypto STATIC IMPORTED)
+set_target_properties(wallet-crypto PROPERTIES IMPORTED_LOCATION
+        ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libwallet-crypto.a)
+
+add_library(cryptonote_format_utils_basic STATIC IMPORTED)
+set_target_properties(cryptonote_format_utils_basic PROPERTIES IMPORTED_LOCATION
+        ${EXTERNAL_LIBS_DIR}/${ANDROID_ABI}/monero/libcryptonote_format_utils_basic.a)
 
 #############
 # System
@@ -153,19 +182,27 @@ set_target_properties(version PROPERTIES IMPORTED_LOCATION
 
 find_library( log-lib log )
 
-include_directories( ${EXTERNAL_LIBS_DIR}/monero/include )
+include_directories( ${EXTERNAL_LIBS_DIR}/include )
 
 message(STATUS EXTERNAL_LIBS_DIR :  ${EXTERNAL_LIBS_DIR})
 
+if(${ANDROID_ABI} STREQUAL "x86_64")
+    set(EXTRA_LIBS "wallet-crypto")
+else()
+    set(EXTRA_LIBS "")
+endif()
+
 target_link_libraries(  monerujo
 
                         wallet_api
                         wallet
                         cryptonote_core
                         cryptonote_basic
+                        cryptonote_format_utils_basic
                         mnemonics
                         ringct
                         ringct_basic
+                        net
                         common
                         cncrypto
                         blockchain_db
@@ -176,8 +213,13 @@ target_link_libraries(  monerujo
                         blocks
                         checkpoints
                         device
+                        device_trezor
                         multisig
                         version
+                        randomx
+                        hardforks
+                        rpc_base
+                        ${EXTRA_LIBS}
 
                         boost_chrono
                         boost_date_time

app/build.gradle

@@ -1,16 +1,16 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    ndkVersion '17.2.4988734'
     defaultConfig {
         applicationId "com.m2049r.xmrwallet"
+        buildToolsVersion = '35.0.0'
+        compileSdk 35
         minSdkVersion 21
-        targetSdkVersion 28
-        versionCode 170
-        versionName "1.11.0 'Chernushka'"
-
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        targetSdkVersion 35
+        versionCode 4107
+        versionName "4.1.7 'Exolix'"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
                 cppFlags "-std=c++11"
@@ -18,8 +18,13 @@ android {
             }
         }
     }
+    bundle {
+        language {
+            enableSplit = false
+        }
+    }
 
-    flavorDimensions 'type', 'net'
+    flavorDimensions = ['type', 'net']
     productFlavors {
         mainnet {
             dimension 'net'
@@ -29,6 +34,11 @@ android {
             applicationIdSuffix '.stage'
             versionNameSuffix ' (stage)'
         }
+        devnet {
+            dimension 'net'
+            applicationIdSuffix '.test'
+            versionNameSuffix ' (test)'
+        }
         alpha {
             dimension 'type'
             applicationIdSuffix '.alpha'
@@ -47,6 +57,9 @@ android {
         debug {
             applicationIdSuffix ".debug"
         }
+        applicationVariants.all { variant ->
+            variant.buildConfigField "String", "ID_F", "\"" + getId("ID_F") + "\""
+        }
     }
 
     externalNativeBuild {
@@ -59,7 +72,7 @@ android {
         abi {
             enable true
             reset()
-            include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+            include 'armeabi-v7a', 'arm64-v8a', 'x86_64'
             universalApk true
         }
     }
@@ -71,7 +84,8 @@ android {
     def availableLocales = ["en"]
     new File("app/src/main/res/").eachFileMatch(~/^values-.*/) { file ->
         def languageTag = file.name.substring(7).replace("-r", "-")
-        availableLocales.add(languageTag)
+        if (languageTag != "night")
+            availableLocales.add(languageTag)
     }
 
     // APKs for the same app that all have the same version information.
@@ -82,8 +96,7 @@ android {
         variant.outputs.all {
             output ->
                 def abiName = output.getFilter(com.android.build.OutputFile.ABI)
-                output.versionCodeOverride = abiCodes.get(abiName, 0) + 10 * variant.versionCode
-                //def flavor = output.getFilter(flavor)
+                output.versionCodeOverride = abiCodes.get(abiName, 0) + 10 * versionCode
 
                 if (abiName == null) abiName = "universal"
                 def v = "${variant.versionName}".replaceFirst(" '.*' ?", "")
@@ -93,32 +106,72 @@ android {
                 outputFileName = "$rootProject.ext.apkName-" + v + "_" + abiName + ".apk"
         }
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    namespace 'com.m2049r.xmrwallet'
+    buildFeatures {
+        buildConfig true
+    }
+
+    testOptions {
+        unitTests {
+            all {
+                jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
+            }
+        }
+    }
+
+    lint {
+        disable "MissingTranslation" // Translation is crowd-sourced.
+    }
+}
+
+static def getId(name) {
+    Properties props = new Properties()
+    props.load(new FileInputStream(new File('monerujo.id')))
+    return props[name]
 }
 
 dependencies {
-    implementation "com.android.support:appcompat-v7:$rootProject.ext.supportVersion"
-    implementation "com.android.support:design:$rootProject.ext.supportVersion"
-    implementation "com.android.support:support-v4:$rootProject.ext.supportVersion"
-    implementation "com.android.support:recyclerview-v7:$rootProject.ext.supportVersion"
-    implementation "com.android.support:cardview-v7:$rootProject.ext.supportVersion"
-    implementation "com.android.support:swiperefreshlayout:$rootProject.ext.supportVersion"
+    implementation(platform('org.jetbrains.kotlin:kotlin-bom:2.1.21'))
+
+    implementation 'androidx.core:core:1.16.0'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.4.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
+    implementation 'androidx.preference:preference:1.2.1'
+
+    implementation 'com.google.android.material:material:1.12.0'
+
+    implementation 'com.google.guava:guava:33.4.8-android'
+
     implementation 'me.dm7.barcodescanner:zxing:1.9.8'
+    implementation "com.squareup.okhttp3:okhttp:4.12.0"
+    implementation 'io.github.rburgst:okhttp-digest:3.1.1'
+    implementation "com.jakewharton.timber:timber:5.0.1"
 
-    implementation "com.squareup.okhttp3:okhttp:$rootProject.ext.okHttpVersion"
-    implementation "com.burgstaller:okhttp-digest:1.18"
-    implementation "com.jakewharton.timber:timber:$rootProject.ext.timberVersion"
+    implementation 'info.guardianproject.netcipher:netcipher:2.1.0'
+    //implementation 'info.guardianproject.netcipher:netcipher-okhttp3:2.1.0'
+    implementation fileTree(dir: 'libs/classes', include: ['*.jar'])
+    implementation 'com.nulab-inc:zxcvbn:1.9.0'
 
-    implementation 'com.nulab-inc:zxcvbn:1.2.3'
-
-    implementation 'dnsjava:dnsjava:2.1.8'
-    implementation 'org.jitsi:dnssecjava:1.1.3'
-    implementation 'org.slf4j:slf4j-nop:1.7.25'
+    implementation 'dnsjava:dnsjava:3.6.3'
+    implementation 'org.slf4j:slf4j-nop:2.0.17'
     implementation 'com.github.brnunes:swipeablerecyclerview:1.0.2'
 
-    testImplementation "junit:junit:$rootProject.ext.junitVersion"
-    testImplementation "org.mockito:mockito-all:$rootProject.ext.mockitoVersion"
-    testImplementation "com.squareup.okhttp3:mockwebserver:$rootProject.ext.okHttpVersion"
-    testImplementation 'org.json:json:20180813'
-    testImplementation 'net.jodah:concurrentunit:0.4.4'
+    //noinspection GradleDependency
+    testImplementation "junit:junit:4.13.2"
+    testImplementation "org.mockito:mockito-all:1.10.19"
+    testImplementation "com.squareup.okhttp3:mockwebserver:4.12.0"
+    testImplementation 'org.json:json:20250517'
+    testImplementation 'net.jodah:concurrentunit:0.4.6'
 
+    compileOnly 'org.projectlombok:lombok:1.18.38'
+    annotationProcessor 'org.projectlombok:lombok:1.18.38'
 }

app/src/main/AndroidManifest.xml

@@ -1,57 +1,89 @@
 <?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-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
-    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
-    <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
+
+    <queries>
+        <intent>
+            <action android:name="org.torproject.android.intent.action.START" />
+        </intent>
+        <intent>
+            <action android:name="org.torproject.android.intent.action.STATUS" />
+        </intent>
+        <intent>
+            <action android:name="org.torproject.android.REQUEST_HS_PORT" />
+        </intent>
+        <intent>
+            <action android:name="org.torproject.android.REQUEST_V3_ONION_SERVICE" />
+        </intent>
+
+        <package android:name="org.torproject.android" />
+    </queries>
 
     <application
         android:name=".XmrWalletApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:preserveLegacyExternalStorage="true"
         android:supportsRtl="true"
-        android:theme="@style/MyMaterialTheme"
+        android:theme="@style/MyMaterialThemeClassic"
         android:usesCleartextTraffic="true">
+        <activity
+            android:name=".MainActivity"
+            android:configChanges="orientation|keyboardHidden|uiMode"
+            android:exported="true"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
 
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".WalletActivity"
-            android:configChanges="orientation|keyboardHidden"
+            android:configChanges="orientation|keyboardHidden|uiMode"
             android:label="@string/wallet_activity_name"
             android:launchMode="singleTask"
             android:screenOrientation="behind" />
-
         <activity
             android:name=".LoginActivity"
             android:configChanges="orientation|keyboardHidden"
+            android:exported="true"
             android:label="@string/app_name"
             android:launchMode="singleTop"
             android:screenOrientation="locked">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
             <intent-filter>
                 <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
             </intent-filter>
-
             <intent-filter android:label="@string/app_name">
                 <action android:name="android.intent.action.VIEW" />
+
                 <data android:scheme="monero" />
 
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
             </intent-filter>
-
             <intent-filter android:label="@string/app_name">
                 <action android:name="android.intent.action.VIEW" />
+
                 <data android:scheme="bitcoin" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -62,15 +94,25 @@
                 android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
                 android:resource="@xml/usb_device_filter" />
         </activity>
+        <activity
+            android:name=".onboarding.OnBoardingActivity"
+            android:configChanges="orientation|keyboardHidden|uiMode"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" />
 
         <service
             android:name=".service.WalletService"
             android:description="@string/service_description"
             android:exported="false"
-            android:label="Monero Wallet Service" />
+            android:foregroundServiceType="specialUse"
+            android:label="Monero Wallet Service">
+            <property
+                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+                android:value="Keeps app in sync with the blockchain" />
+        </service>
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
@@ -79,4 +121,5 @@
                 android:resource="@xml/filepaths" />
         </provider>
     </application>
+
 </manifest>

app/src/main/cpp/device_io_monerujo.hpp

@@ -1,88 +0,0 @@
-// Copyright (c) 2017-2018, The Monero Project
-//
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification, are
-// permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice, this list of
-//    conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright notice, this list
-//    of conditions and the following disclaimer in the documentation and/or other
-//    materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its contributors may be
-//    used to endorse or promote products derived from this software without specific
-//    prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-
-#if defined(HAVE_MONERUJO)
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-/**
- * @brief LedgerFind - find Ledger Device and return it's name
- * @param buffer     - buffer for name of found device
- * @param len        - length of buffer
- * @return  0 - success
- *         -1 - no device connected / found
- *         -2 - JVM not found
- */
-int LedgerFind(char *buffer, size_t len);
-
-/**
- * @brief LedgerExchange - exchange data with Ledger Device
- * @param command        - buffer for data to send
- * @param cmd_len        - length of send to send
- * @param response       - buffer for received data
- * @param max_resp_len   - size of receive buffer
- *
- * @return length of received data in response or -1 if error
- */
-int  LedgerExchange(unsigned char *command, unsigned int cmd_len, unsigned char *response, unsigned int max_resp_len);
-
-#ifdef __cplusplus
-}
-#endif
-
-#include "device_io.hpp"
-
-#pragma once
-
-namespace hw {
-  namespace io {
-    class device_io_monerujo: device_io {
-    public:
-      device_io_monerujo() {};
-      ~device_io_monerujo() {};
-
-      void init() {};
-      void release() {};
-
-      void connect(void *params) {};
-      void disconnect() {};
-      bool connected() const {return true;}; // monerujo is always connected before it gets here
-
-      // returns number of bytes read or -1 on error
-      int  exchange(unsigned char *command, unsigned int cmd_len, unsigned char *response, unsigned int max_resp_len) {
-        return LedgerExchange(command, cmd_len, response, max_resp_len);
-      }
-    };
-  };
-};
-
-#endif //#if defined(HAVE_MONERUJO)

app/src/main/cpp/monerujo.h

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 m2049r
+ * Copyright (c) 2017-2024 m2049r
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,8 @@
 
 #include <jni.h>
 
+#include <string>
+
 /*
 #include <android/log.h>
 
@@ -28,6 +30,10 @@
 #define  LOGE(...)  __android_log_print(ANDROID_LOG_ERROR,LOG_TAG,__VA_ARGS__)
 */
 
+void ThrowException(JNIEnv *jenv, const char* type, const char* msg) {
+    jenv->ThrowNew(jenv->FindClass(type), msg);
+}
+
 jfieldID getHandleField(JNIEnv *env, jobject obj, const char *fieldName = "handle") {
     jclass c = env->GetObjectClass(obj);
     return env->GetFieldID(c, fieldName, "J"); // of type long
@@ -35,8 +41,16 @@ jfieldID getHandleField(JNIEnv *env, jobject obj, const char *fieldName = "handl
 
 template<typename T>
 T *getHandle(JNIEnv *env, jobject obj, const char *fieldName = "handle") {
+    return reinterpret_cast<T *>(env->GetLongField(obj, getHandleField(env, obj, fieldName)));
+}
+
+template<typename T>
+void destroyNativeObject(JNIEnv *env, T nativeObjectHandle, jobject obj, const char *fieldName = "handle") {
     jlong handle = env->GetLongField(obj, getHandleField(env, obj, fieldName));
-    return reinterpret_cast<T *>(handle);
+    if (handle != 0) {
+        ThrowException(env, "java/lang/IllegalStateException", "invalid handle (destroy)");
+    }
+    delete reinterpret_cast<T *>(nativeObjectHandle);
 }
 
 void setHandleFromLong(JNIEnv *env, jobject obj, jlong handle) {
@@ -54,24 +68,48 @@ extern "C"
 {
 #endif
 
+extern const char *const MONERO_VERSION; // the actual monero core version
+
 // from monero-core crypto/hash-ops.h - avoid #including monero code here
 enum {
     HASH_SIZE = 32,
     HASH_DATA_AREA = 136
 };
 
-void cn_slow_hash(const void *data, size_t length, char *hash, int variant, int prehashed, uint64_t height);
+void cn_slow_hash(const void *data, size_t length, char *hash, int variant, int prehashed,
+                  uint64_t height);
 
 inline void slow_hash(const void *data, const size_t length, char *hash) {
     cn_slow_hash(data, length, hash, 0 /*variant*/, 0 /*prehashed*/, 0 /*height*/);
 }
 
 inline void slow_hash_broken(const void *data, char *hash, int variant) {
-    cn_slow_hash(data, 200 /*sizeof(union hash_state)*/, hash, variant, 1 /*prehashed*/, 0 /*height*/);
+    cn_slow_hash(data, 200 /*sizeof(union hash_state)*/, hash, variant, 1 /*prehashed*/,
+                 0 /*height*/);
 }
-
 #ifdef __cplusplus
 }
 #endif
 
+namespace Monerujo {
+    class SidekickWallet {
+    public:
+        enum Status {
+            Status_Ok,
+            Status_Error,
+            Status_Critical
+        };
+
+        SidekickWallet(uint8_t networkType, std::string a, std::string b);
+
+        ~SidekickWallet();
+
+        std::string call(int commandId, const std::string &request);
+
+        void reset();
+
+        Status status() const;
+
+    };
+}
 #endif //XMRWALLET_WALLET_LIB_H

app/src/main/java/com/btchip/comm/BTChipTransport.java

@@ -20,8 +20,6 @@
 
 package com.btchip.comm;
 
-import com.btchip.BTChipException;
-
 public interface BTChipTransport {
     byte[] exchange(byte[] command);
 

app/src/main/java/com/btchip/comm/android/BTChipTransportAndroidHID.java

@@ -28,7 +28,6 @@ import android.hardware.usb.UsbInterface;
 import android.hardware.usb.UsbManager;
 import android.hardware.usb.UsbRequest;
 
-import com.btchip.BTChipException;
 import com.btchip.comm.BTChipTransport;
 import com.btchip.comm.LedgerHelper;
 import com.btchip.utils.Dump;
@@ -46,8 +45,12 @@ public class BTChipTransportAndroidHID implements BTChipTransport {
         HashMap<String, UsbDevice> deviceList = manager.getDeviceList();
         for (UsbDevice device : deviceList.values()) {
             Timber.d("%04X:%04X %s, %s", device.getVendorId(), device.getProductId(), device.getManufacturerName(), device.getProductName());
-            if ((device.getVendorId() == VID) && (device.getProductId() == PID_HID)) {
-                return device;
+            if (device.getVendorId() == VID) {
+                final int deviceProductId = device.getProductId();
+                for (int pid : PID_HIDS) {
+                    if (deviceProductId == pid)
+                        return device;
+                }
             }
         }
         return null;
@@ -74,7 +77,7 @@ public class BTChipTransportAndroidHID implements BTChipTransport {
     }
 
     private static final int VID = 0x2C97;
-    private static final int PID_HID = 0x0001;
+    private static final int[] PID_HIDS = {0x0001, 0x0004, 0x0005};
 
     private UsbDeviceConnection connection;
     private UsbInterface dongleInterface;

app/src/main/java/com/m2049r/levin/scanner/Dispatcher.java

@@ -77,7 +77,7 @@ public class Dispatcher implements PeerRetriever.OnGetPeers {
                     final NodeInfo nodeInfo = retrievedPeer.getNodeInfo();
                     Timber.d("Retrieved %s", nodeInfo);
                     if ((nodeInfo.isValid() || nodeInfo.isFavourite())) {
-                        nodeInfo.setName();
+                        nodeInfo.setDefaultName();
                         rpcNodes.add(nodeInfo);
                         Timber.d("RPC: %s", nodeInfo);
                         // the following is not totally correct but it works (otherwise we need to
@@ -185,7 +185,6 @@ public class Dispatcher implements PeerRetriever.OnGetPeers {
 
     public void seedPeers(Collection<NodeInfo> seedNodes) {
         for (NodeInfo node : seedNodes) {
-            node.clear();
             if (node.isFavourite()) {
                 rpcNodes.add(node);
                 if (listener != null) listener.onGet(node);

app/src/main/java/com/m2049r/levin/scanner/LevinPeer.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2018 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.m2049r.levin.scanner;
 
 import java.net.InetAddress;

app/src/main/java/com/m2049r/xmrwallet/LockFragment.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2024 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+
+import timber.log.Timber;
+
+public class LockFragment extends Fragment {
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        Timber.d("onCreateView");
+        final FrameLayout frame = new FrameLayout(requireContext());
+        frame.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+        return frame;
+    }
+}

app/src/main/java/com/m2049r/xmrwallet/MainActivity.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2018-2020 EarlOfEgo, m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
+import com.m2049r.xmrwallet.onboarding.OnBoardingActivity;
+import com.m2049r.xmrwallet.onboarding.OnBoardingManager;
+
+public class MainActivity extends BaseActivity {
+    @Override
+    protected void onCreate(@Nullable final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (OnBoardingManager.shouldShowOnBoarding(getApplicationContext())) {
+            startActivity(new Intent(this, OnBoardingActivity.class));
+        } else {
+            startActivity(new Intent(this, LoginActivity.class));
+        }
+        finish();
+    }
+}

app/src/main/java/com/m2049r/xmrwallet/OnBlockUpdateListener.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2021 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet;
+
+import com.m2049r.xmrwallet.model.Wallet;
+
+public interface OnBlockUpdateListener {
+    void onBlockUpdate(final Wallet wallet);
+}

app/src/main/java/com/m2049r/xmrwallet/ScannerFragment.java

@@ -19,12 +19,14 @@ package com.m2049r.xmrwallet;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.Result;
 
@@ -42,7 +44,7 @@ public class ScannerFragment extends Fragment implements ZXingScannerView.Result
     private ZXingScannerView mScannerView;
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         Timber.d("onCreateView");
         mScannerView = new ZXingScannerView(getActivity());
         return mScannerView;
@@ -73,14 +75,7 @@ public class ScannerFragment extends Fragment implements ZXingScannerView.Result
         // * On older devices continuously stopping and resuming camera preview can result in freezing the app.
         // * I don't know why this is the case but I don't have the time to figure out.
         Handler handler = new Handler();
-        handler.postDelayed(new
-
-                                    Runnable() {
-                                        @Override
-                                        public void run() {
-                                            mScannerView.resumeCameraPreview(ScannerFragment.this);
-                                        }
-                                    }, 2000);
+        handler.postDelayed(() -> mScannerView.resumeCameraPreview(ScannerFragment.this), 2000);
     }
 
     @Override
@@ -91,7 +86,7 @@ public class ScannerFragment extends Fragment implements ZXingScannerView.Result
     }
 
     @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NonNull Context context) {
         super.onAttach(context);
         if (context instanceof OnScannedListener) {
             this.onScannedListener = (OnScannedListener) context;

app/src/main/java/com/m2049r/xmrwallet/SecureActivity.java

@@ -16,28 +16,58 @@
 
 package com.m2049r.xmrwallet;
 
-import android.content.Context;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import static android.view.WindowManager.LayoutParams;
 
+import android.content.Context;
+import android.content.res.Configuration;
+import android.os.Build;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.m2049r.xmrwallet.util.Helper;
 import com.m2049r.xmrwallet.util.LocaleHelper;
 
-import static android.view.WindowManager.LayoutParams;
+import java.util.Locale;
 
 public abstract class SecureActivity extends AppCompatActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        // set FLAG_SECURE to prevent screenshots in Release Mode
-        if (!(BuildConfig.DEBUG && BuildConfig.FLAVOR_type.equals("alpha"))) {
+        if (Helper.preventScreenshot()) {
             getWindow().setFlags(LayoutParams.FLAG_SECURE, LayoutParams.FLAG_SECURE);
         }
     }
 
     @Override
-    protected void attachBaseContext(Context context) {
-        super.attachBaseContext(LocaleHelper.setLocale(context, LocaleHelper.getLocale(context)));
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(newBase);
+        applyOverrideConfiguration(new Configuration());
+    }
+
+    @Override
+    public void applyOverrideConfiguration(Configuration newConfig) {
+        super.applyOverrideConfiguration(updateConfigurationIfSupported(newConfig));
+    }
+
+    private Configuration updateConfigurationIfSupported(Configuration config) {
+        // Configuration.getLocales is added after 24 and Configuration.locale is deprecated in 24
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            if (!config.getLocales().isEmpty()) {
+                return config;
+            }
+        } else {
+            if (config.locale != null) {
+                return config;
+            }
+        }
+
+        Locale locale = LocaleHelper.getPreferredLocale(this);
+        if (locale != null) {
+            config.setLocale(locale);
+        }
+        return config;
     }
 }

app/src/main/java/com/m2049r/xmrwallet/SettingsFragment.java

@@ -0,0 +1,126 @@
+package com.m2049r.xmrwallet;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.StyleRes;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceManager;
+
+import com.m2049r.xmrwallet.dialog.AboutFragment;
+import com.m2049r.xmrwallet.dialog.CreditsFragment;
+import com.m2049r.xmrwallet.dialog.PrivacyFragment;
+import com.m2049r.xmrwallet.util.DayNightMode;
+import com.m2049r.xmrwallet.util.LocaleHelper;
+import com.m2049r.xmrwallet.util.NightmodeHelper;
+import com.m2049r.xmrwallet.util.ThemeHelper;
+import com.m2049r.xmrwallet.widget.Toolbar;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Locale;
+
+import timber.log.Timber;
+
+public class SettingsFragment extends PreferenceFragmentCompat
+        implements SharedPreferences.OnSharedPreferenceChangeListener {
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        setPreferencesFromResource(R.xml.root_preferences, rootKey);
+
+        findPreference(getString(R.string.about_info)).setOnPreferenceClickListener(preference -> {
+            AboutFragment.display(getParentFragmentManager());
+            return true;
+        });
+        findPreference(getString(R.string.privacy_info)).setOnPreferenceClickListener(preference -> {
+            PrivacyFragment.display(getParentFragmentManager());
+            return true;
+        });
+        findPreference(getString(R.string.credits_info)).setOnPreferenceClickListener(preference -> {
+            CreditsFragment.display(getParentFragmentManager());
+            return true;
+        });
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        if (key.equals(getString(R.string.preferred_locale))) {
+            activity.recreate();
+        } else if (key.equals(getString(R.string.preferred_nightmode))) {
+            NightmodeHelper.setNightMode(DayNightMode.valueOf(sharedPreferences.getString(key, "AUTO")));
+        } else if (key.equals(getString(R.string.preferred_theme))) {
+            ThemeHelper.setTheme((Activity) activity, sharedPreferences.getString(key, "Classic"));
+            activity.recreate();
+        }
+    }
+
+    private SettingsFragment.Listener activity;
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        if (context instanceof SettingsFragment.Listener) {
+            activity = (SettingsFragment.Listener) context;
+        } else {
+            throw new ClassCastException(context + " must implement Listener");
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        Timber.d("onResume()");
+        activity.setSubtitle(getString(R.string.menu_settings));
+        activity.setToolbarButton(Toolbar.BUTTON_BACK);
+        populateLanguages();
+        PreferenceManager.getDefaultSharedPreferences(requireContext())
+                .registerOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        PreferenceManager.getDefaultSharedPreferences(requireContext())
+                .unregisterOnSharedPreferenceChangeListener(this);
+    }
+
+    public interface Listener {
+        void setToolbarButton(int type);
+
+        void setSubtitle(String title);
+
+        void recreate();
+
+        void setTheme(@StyleRes final int resId);
+    }
+
+    public void populateLanguages() {
+        ListPreference language = findPreference(getString(R.string.preferred_locale));
+        assert language != null;
+
+        final ArrayList<Locale> availableLocales = LocaleHelper.getAvailableLocales(requireContext());
+        Collections.sort(availableLocales, (locale1, locale2) -> {
+            String localeString1 = LocaleHelper.getDisplayName(locale1, true);
+            String localeString2 = LocaleHelper.getDisplayName(locale2, true);
+            return localeString1.compareTo(localeString2);
+        });
+
+        String[] localeDisplayNames = new String[1 + availableLocales.size()];
+        localeDisplayNames[0] = getString(R.string.language_system_default);
+        for (int i = 1; i < localeDisplayNames.length; i++) {
+            localeDisplayNames[i] = LocaleHelper.getDisplayName(availableLocales.get(i - 1), true);
+        }
+        language.setEntries(localeDisplayNames);
+
+        String[] languageTags = new String[1 + availableLocales.size()];
+        languageTags[0] = "";
+        for (int i = 1; i < languageTags.length; i++) {
+            languageTags[i] = availableLocales.get(i - 1).toLanguageTag();
+        }
+        language.setEntryValues(languageTags);
+    }
+}

app/src/main/java/com/m2049r/xmrwallet/SidekickConnectFragment.java

@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2018 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothClass;
+import android.bluetooth.BluetoothDevice;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
+import com.m2049r.xmrwallet.data.BluetoothInfo;
+import com.m2049r.xmrwallet.layout.BluetoothInfoAdapter;
+import com.m2049r.xmrwallet.util.Helper;
+import com.m2049r.xmrwallet.widget.Toolbar;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import timber.log.Timber;
+
+public class SidekickConnectFragment extends Fragment
+        implements BluetoothInfoAdapter.OnInteractionListener {
+
+    private BluetoothAdapter bluetoothAdapter;
+
+    private SwipeRefreshLayout pullToRefresh;
+
+    private BluetoothInfoAdapter infoAdapter;
+
+    private Listener activityCallback;
+
+    public interface Listener {
+        void setToolbarButton(int type);
+
+        void setSubtitle(String title);
+    }
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        if (context instanceof Listener) {
+            this.activityCallback = (Listener) context;
+        } else {
+            throw new ClassCastException(context + " must implement Listener");
+        }
+    }
+
+    @Override
+    public void onPause() {
+        Timber.d("onPause()");
+        if (ActivityCompat.checkSelfPermission(requireContext(), android.Manifest.permission.BLUETOOTH_SCAN) != PackageManager.PERMISSION_GRANTED) {
+            Toast.makeText(requireContext(), "Bluetooth permission not granted", Toast.LENGTH_LONG).show();
+        } else {
+            if (bluetoothAdapter.isDiscovering()) {
+                bluetoothAdapter.cancelDiscovery();
+            }
+        }
+        super.onPause();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        Timber.d("onResume()");
+        activityCallback.setSubtitle(getString(R.string.label_bluetooth));
+        activityCallback.setToolbarButton(Toolbar.BUTTON_BACK);
+        final BluetoothFragment btFragment = (BluetoothFragment) getChildFragmentManager().findFragmentById(R.id.bt_fragment);
+        assert btFragment != null;
+        btFragment.start();
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        Timber.d("onCreateView");
+        View view = inflater.inflate(R.layout.fragment_sidekick_connect, container, false);
+
+        RecyclerView recyclerView = view.findViewById(R.id.list);
+        infoAdapter = new BluetoothInfoAdapter(this);
+        recyclerView.setAdapter(infoAdapter);
+
+        pullToRefresh = view.findViewById(R.id.pullToRefresh);
+        pullToRefresh.setOnRefreshListener(() -> {
+            populateList();
+            pullToRefresh.setRefreshing(false);
+        });
+
+        return view;
+    }
+
+    private void populateList() {
+        List<BluetoothInfo> items = new ArrayList<>();
+        if (ActivityCompat.checkSelfPermission(requireContext(), android.Manifest.permission.BLUETOOTH_SCAN) != PackageManager.PERMISSION_GRANTED) {
+            Toast.makeText(requireContext(), "Bluetooth permission not granted", Toast.LENGTH_LONG).show();
+            return;
+        }
+        for (BluetoothDevice device : bluetoothAdapter.getBondedDevices()) {
+            final int deviceCLass = device.getBluetoothClass().getDeviceClass();
+            switch (deviceCLass) {
+                case BluetoothClass.Device.PHONE_SMART:
+                    //TODO verify these are correct
+                case BluetoothClass.Device.COMPUTER_HANDHELD_PC_PDA:
+                case BluetoothClass.Device.COMPUTER_PALM_SIZE_PC_PDA:
+                    items.add(new BluetoothInfo(device));
+            }
+        }
+        infoAdapter.setItems(items);
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        Helper.hideKeyboard(getActivity());
+
+        // Get the local Bluetooth adapter
+        bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        populateList();
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(@NonNull Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.sidekick_connect_menu, menu);
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        // Make sure we're not doing discovery anymore
+        if (bluetoothAdapter != null) {
+            if (ActivityCompat.checkSelfPermission(requireContext(), android.Manifest.permission.BLUETOOTH_SCAN) != PackageManager.PERMISSION_GRANTED) {
+                Toast.makeText(requireContext(), "Bluetooth permission not granted", Toast.LENGTH_LONG).show();
+                return;
+            }
+            bluetoothAdapter.cancelDiscovery();
+        }
+    }
+
+    @Override
+    public void onInteraction(final View view, final BluetoothInfo item) {
+        Timber.d("onInteraction %s", item);
+        if (ActivityCompat.checkSelfPermission(requireContext(), android.Manifest.permission.BLUETOOTH_SCAN) != PackageManager.PERMISSION_GRANTED)
+            throw new IllegalStateException("Bluetooth permission not granted");
+        bluetoothAdapter.cancelDiscovery();
+
+        final BluetoothFragment btFragment = (BluetoothFragment) getChildFragmentManager().findFragmentById(R.id.bt_fragment);
+        assert btFragment != null;
+        btFragment.connectDevice(item.getAddress());
+    }
+
+    public void allowClick() {
+        infoAdapter.allowClick(true);
+    }
+}

app/src/main/java/com/m2049r/xmrwallet/SubaddressFragment.java

@@ -0,0 +1,242 @@
+/*
+ * Copyright (c) 2017 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.m2049r.xmrwallet.data.Subaddress;
+import com.m2049r.xmrwallet.layout.SubaddressInfoAdapter;
+import com.m2049r.xmrwallet.ledger.LedgerProgressDialog;
+import com.m2049r.xmrwallet.model.TransactionInfo;
+import com.m2049r.xmrwallet.model.Wallet;
+import com.m2049r.xmrwallet.model.WalletManager;
+import com.m2049r.xmrwallet.util.Helper;
+import com.m2049r.xmrwallet.util.MoneroThreadPoolExecutor;
+import com.m2049r.xmrwallet.widget.Toolbar;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import timber.log.Timber;
+
+public class SubaddressFragment extends Fragment implements SubaddressInfoAdapter.OnInteractionListener,
+        View.OnClickListener, OnBlockUpdateListener {
+    static public final String KEY_MODE = "mode";
+    static public final String MODE_MANAGER = "manager";
+
+    private SubaddressInfoAdapter adapter;
+
+    private Listener activityCallback;
+
+    private Wallet wallet;
+
+    // Container Activity must implement this interface
+    public interface Listener {
+        void onSubaddressSelected(Subaddress subaddress);
+
+        void setSubtitle(String title);
+
+        void setToolbarButton(int type);
+
+        void showSubaddress(View view, final int subaddressIndex);
+
+        void saveWallet();
+    }
+
+    public interface ProgressListener {
+        void showProgressDialog(int msgId);
+
+        void showLedgerProgressDialog(int mode);
+
+        void dismissProgressDialog();
+    }
+
+    private ProgressListener progressCallback = null;
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        if (context instanceof ProgressListener) {
+            progressCallback = (ProgressListener) context;
+        }
+        if (context instanceof Listener) {
+            activityCallback = (Listener) context;
+        } else {
+            throw new ClassCastException(context.toString()
+                    + " must implement Listener");
+        }
+    }
+
+    @Override
+    public void onPause() {
+        Timber.d("onPause()");
+        super.onPause();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        activityCallback.setSubtitle(getString(R.string.subbaddress_title));
+        activityCallback.setToolbarButton(Toolbar.BUTTON_BACK);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        Timber.d("onCreateView");
+
+        final Bundle b = getArguments();
+        managerMode = ((b != null) && (MODE_MANAGER.equals(b.getString(KEY_MODE))));
+
+        View view = inflater.inflate(R.layout.fragment_subaddress, container, false);
+        view.findViewById(R.id.fab).setOnClickListener(this);
+
+        if (managerMode) {
+            view.findViewById(R.id.tvInstruction).setVisibility(View.GONE);
+            view.findViewById(R.id.tvHint).setVisibility(View.GONE);
+        }
+
+        final RecyclerView list = view.findViewById(R.id.list);
+        adapter = new SubaddressInfoAdapter(getActivity(), this);
+        list.setAdapter(adapter);
+        adapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() {
+            @Override
+            public void onItemRangeInserted(int positionStart, int itemCount) {
+                list.scrollToPosition(positionStart);
+            }
+        });
+
+        Helper.hideKeyboard(getActivity());
+
+        wallet = WalletManager.getInstance().getWallet();
+
+        loadList();
+
+        return view;
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+    }
+
+    public void loadList() {
+        Timber.d("loadList()");
+        final int numSubaddresses = wallet.getNumSubaddresses();
+        final List<Subaddress> list = new ArrayList<>();
+        for (int i = 0; i < numSubaddresses; i++) {
+            list.add(wallet.getSubaddressObject(i));
+        }
+        adapter.setInfos(list);
+    }
+
+    @Override
+    public void onBlockUpdate(Wallet wallet) {
+        loadList();
+    }
+
+    @Override
+    public void onClick(View v) {
+        int id = v.getId();
+        if (id == R.id.fab) {
+            getNewSubaddress();
+        }
+    }
+
+    private int lastUsedSubaddress() {
+        int lastUsedSubaddress = 0;
+        for (TransactionInfo info : wallet.getHistory().getAll()) {
+            if (info.addressIndex > lastUsedSubaddress)
+                lastUsedSubaddress = info.addressIndex;
+        }
+        return lastUsedSubaddress;
+    }
+
+    private void getNewSubaddress() {
+        final int maxSubaddresses = lastUsedSubaddress() + wallet.getDeviceType().getSubaddressLookahead();
+        if (wallet.getNumSubaddresses() < maxSubaddresses)
+            new AsyncSubaddress().executeOnExecutor(MoneroThreadPoolExecutor.MONERO_THREAD_POOL_EXECUTOR);
+        else
+            Toast.makeText(getActivity(), getString(R.string.max_subaddress_warning), Toast.LENGTH_LONG).show();
+    }
+
+    @SuppressLint("StaticFieldLeak")
+    @RequiredArgsConstructor
+    private class AsyncSubaddress extends AsyncTask<Void, Void, Boolean> {
+        boolean dialogOpened = false;
+
+        @Override
+        protected void onPreExecute() {
+            super.onPreExecute();
+            if ((wallet.getDeviceType() == Wallet.Device.Ledger) && (progressCallback != null)) {
+                progressCallback.showLedgerProgressDialog(LedgerProgressDialog.TYPE_SUBADDRESS);
+                dialogOpened = true;
+            }
+        }
+
+        @Override
+        protected Boolean doInBackground(Void... params) {
+            if (params.length != 0) return false;
+            wallet.getNewSubaddress();
+            if (activityCallback != null) {
+                activityCallback.saveWallet();
+            }
+            return true;
+        }
+
+        @Override
+        protected void onPostExecute(Boolean result) {
+            super.onPostExecute(result);
+            if (dialogOpened)
+                progressCallback.dismissProgressDialog();
+            if (!isAdded()) // never mind then
+                return;
+            loadList();
+        }
+    }
+
+    boolean managerMode = false;
+
+    // Callbacks from SubaddressInfoAdapter
+    @Override
+    public void onInteraction(final View view, @NonNull final Subaddress subaddress) {
+        if (managerMode)
+            activityCallback.showSubaddress(view, subaddress.getAddressIndex());
+        else
+            activityCallback.onSubaddressSelected(subaddress); // also closes the fragment with onBackpressed()
+    }
+
+    @Override
+    public boolean onLongInteraction(View view, Subaddress subaddress) {
+        activityCallback.showSubaddress(view, subaddress.getAddressIndex());
+        return false;
+    }
+
+}

app/src/main/java/com/m2049r/xmrwallet/SubaddressInfoFragment.java

@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) 2017 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.EditorInfo;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.transition.Transition;
+import androidx.transition.TransitionInflater;
+
+import com.google.android.material.textfield.TextInputLayout;
+import com.m2049r.xmrwallet.data.Subaddress;
+import com.m2049r.xmrwallet.layout.TransactionInfoAdapter;
+import com.m2049r.xmrwallet.model.TransactionInfo;
+import com.m2049r.xmrwallet.model.Wallet;
+import com.m2049r.xmrwallet.util.Helper;
+import com.m2049r.xmrwallet.widget.Toolbar;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import timber.log.Timber;
+
+public class SubaddressInfoFragment extends Fragment
+        implements TransactionInfoAdapter.Listener, OnBlockUpdateListener {
+    private TransactionInfoAdapter adapter;
+
+    private Subaddress subaddress;
+
+    private TextInputLayout etName;
+    private TextView tvTxLabel;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_subaddressinfo, container, false);
+
+        etName = view.findViewById(R.id.etName);
+        tvTxLabel = view.findViewById(R.id.tvTxLabel);
+
+        final RecyclerView list = view.findViewById(R.id.list);
+        adapter = new TransactionInfoAdapter(getActivity(), this);
+        list.setAdapter(adapter);
+
+        final Wallet wallet = activityCallback.getWallet();
+
+        Bundle b = getArguments();
+        assert b != null;
+        final int subaddressIndex = b.getInt("subaddressIndex");
+        subaddress = wallet.getSubaddressObject(subaddressIndex);
+
+        etName.getEditText().setText(subaddress.getDisplayLabel());
+        final TextView tvAddress = view.findViewById(R.id.tvAddress);
+        tvAddress.setText(requireContext().getString(R.string.subbaddress_info_subtitle,
+                subaddress.getAddressIndex(), subaddress.getAddress()));
+
+        etName.getEditText().setOnFocusChangeListener((v, hasFocus) -> {
+            if (!hasFocus) {
+                wallet.setSubaddressLabel(subaddressIndex, etName.getEditText().getText().toString());
+            }
+        });
+        etName.getEditText().setOnEditorActionListener((v, actionId, event) -> {
+            if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER) && (event.getAction() == KeyEvent.ACTION_DOWN))
+                    || (actionId == EditorInfo.IME_ACTION_DONE)) {
+                Helper.hideKeyboard(getActivity());
+                wallet.setSubaddressLabel(subaddressIndex, etName.getEditText().getText().toString());
+                onRefreshed(wallet);
+                return true;
+            }
+            return false;
+        });
+
+        onRefreshed(wallet);
+
+        return view;
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Transition transform = TransitionInflater.from(requireContext())
+                .inflateTransition(R.transition.details);
+        setSharedElementEnterTransition(transform);
+    }
+
+    public void onRefreshed(final Wallet wallet) {
+        Timber.d("onRefreshed");
+        List<TransactionInfo> list = new ArrayList<>();
+        for (TransactionInfo info : wallet.getHistory().getAll()) {
+            if (info.addressIndex == subaddress.getAddressIndex())
+                list.add(info);
+        }
+        adapter.setInfos(list);
+        if (list.isEmpty())
+            tvTxLabel.setText(R.string.subaddress_notx_label);
+        else
+            tvTxLabel.setText(R.string.subaddress_tx_label);
+    }
+
+    @Override
+    public void onBlockUpdate(Wallet wallet) {
+        onRefreshed(wallet);
+    }
+
+    // Callbacks from TransactionInfoAdapter
+    @Override
+    public void onInteraction(final View view, final TransactionInfo infoItem) {
+        activityCallback.onTxDetailsRequest(view, infoItem);
+    }
+
+    Listener activityCallback;
+
+    // Container Activity must implement this interface
+    public interface Listener {
+        void onTxDetailsRequest(View view, TransactionInfo info);
+
+        Wallet getWallet();
+
+        void setToolbarButton(int type);
+
+        void setTitle(String title, String subtitle);
+
+        void setSubtitle(String subtitle);
+
+        long getDaemonHeight();
+    }
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        if (context instanceof Listener) {
+            this.activityCallback = (Listener) context;
+        } else {
+            throw new ClassCastException(context.toString()
+                    + " must implement Listener");
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        Timber.d("onResume()");
+        activityCallback.setSubtitle(getString(R.string.subbaddress_title));
+        activityCallback.setToolbarButton(Toolbar.BUTTON_BACK);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+    }
+
+    @Override
+    public long getDaemonHeight() {
+        return activityCallback.getDaemonHeight();
+    }
+}