fix length test (#314)

* new version

* fix balance

.circleci/config.yml

@@ -0,0 +1,27 @@
+version: 2
+jobs:
+  build:
+    working_directory: ~/code
+    docker:
+      - image: bitriseio/android-ndk
+    environment:
+      JVM_OPTS: -Xmx3200m
+    steps:
+      - checkout
+      - restore_cache:
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
+      - run:
+          name: Download Dependencies
+          command: ./gradlew androidDependencies
+      - save_cache:
+          paths:
+            - ~/.gradle
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
+      - run:
+          name: Run Tests
+          command: ./gradlew test
+      - store_artifacts:
+          path: app/build/reports
+          destination: reports
+      - store_test_results:
+          path: app/build/test-results

.gitignore

@@ -1,8 +1,7 @@
 .gradle
 /build
 *.iml
-/.idea/libraries
+/.idea
-/.idea/workspace.xml
 /local.properties
 /captures
 .externalNativeBuild

README.md

@@ -1,12 +1,23 @@
 # Monerujo
-Another Android Monero Wallet
+Another Android Monero Wallet for Monero
+	**(not
+    Monero Classic,
+    Monero-Classic,
+    Monero Zero,
+    Monero Original,
+    Monero C,
+    Monero V)**
 
 ### QUICKSTART
 - Download the APK for the most current release [here](https://github.com/m2049r/xmrwallet/releases) and install it
+- Alternatively add our F-Droid repo https://f-droid.monerujo.io/fdroid/repo with fingerpint ```A8 2C 68 E1 4A F0 AA 6A 2E C2 0E 6B 27 2E FF 25 E5 A0 38 F3 F6 58 84 31 6E 0F 5E 0D 91 E7 B7 13``` to your F-Droid client
 - Run the App and select "Generate Wallet" to create a new wallet or recover a wallet
 - 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.
+
 ### Disclaimer
 You may lose all your Moneroj if you use this App. Be cautious when spending on the mainnet.
 
@@ -23,6 +34,8 @@ You may lose all your Moneroj if you use this App. Be cautious when spending on
 - 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.
 - 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
@@ -33,8 +46,8 @@ The official monero client shows the same behaviour.
 No need to build. Binaries are included:
 
 - openssl-1.0.2l
-- monero-v0.11.1.0
+- monero-v0.12
-- boost_1_64_0
+- boost_1_58_0
 
 If you want to build them yourself (recommended) check out [the instructions](doc/BUILDING-external-libs.md)
 

app/CMakeLists.txt

@@ -60,9 +60,13 @@ set_target_properties(boost_wserialization PROPERTIES IMPORTED_LOCATION
     ${EXTERNAL_LIBS_DIR}/boost/lib/${ANDROID_ABI}/libboost_wserialization.a)
 
 #############
-# Monero set(libs_to_merge wallet cryptonote_core cryptonote_basic mnemonics common cncrypto ringct)
+# Monero
 #############
 
+add_library(wallet_api STATIC IMPORTED)
+set_target_properties(wallet_api PROPERTIES IMPORTED_LOCATION
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libwallet_api.a)
+
 add_library(wallet STATIC IMPORTED)
 set_target_properties(wallet PROPERTIES IMPORTED_LOCATION
     ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libwallet.a)
@@ -91,11 +95,9 @@ add_library(ringct STATIC IMPORTED)
 set_target_properties(ringct PROPERTIES IMPORTED_LOCATION
     ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libringct.a)
 
-#####
+add_library(ringct_basic STATIC IMPORTED)
-
+set_target_properties(ringct_basic PROPERTIES IMPORTED_LOCATION
-add_library(p2p STATIC IMPORTED)
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libringct_basic.a)
-set_target_properties(p2p PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libp2p.a)
 
 add_library(blockchain_db STATIC IMPORTED)
 set_target_properties(blockchain_db PROPERTIES IMPORTED_LOCATION
@@ -113,7 +115,6 @@ add_library(unbound STATIC IMPORTED)
 set_target_properties(unbound PROPERTIES IMPORTED_LOCATION
     ${EXTERNAL_LIBS_DIR}/monero/lib/${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)
@@ -122,9 +123,21 @@ add_library(blocks STATIC IMPORTED)
 set_target_properties(blocks PROPERTIES IMPORTED_LOCATION
     ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libblocks.a)
 
-add_library(miniupnpc STATIC IMPORTED)
+add_library(checkpoints STATIC IMPORTED)
-set_target_properties(miniupnpc PROPERTIES IMPORTED_LOCATION
+set_target_properties(checkpoints PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libminiupnpc.a)
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libcheckpoints.a)
+
+add_library(device STATIC IMPORTED)
+set_target_properties(device PROPERTIES IMPORTED_LOCATION
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libdevice.a)
+
+add_library(multisig STATIC IMPORTED)
+set_target_properties(multisig PROPERTIES IMPORTED_LOCATION
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libmultisig.a)
+
+add_library(version STATIC IMPORTED)
+set_target_properties(version PROPERTIES IMPORTED_LOCATION
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libversion.a)
 
 #############
 # System
@@ -137,23 +150,26 @@ include_directories( ${EXTERNAL_LIBS_DIR}/monero/include )
 message(STATUS EXTERNAL_LIBS_DIR :  ${EXTERNAL_LIBS_DIR})
 
 target_link_libraries(  monerujo
+
+                        wallet_api
                         wallet
                         cryptonote_core
                         cryptonote_basic
                         mnemonics
                         ringct
+                        ringct_basic
                         common
                         cncrypto
-
                         blockchain_db
                         lmdb
                         easylogging
                         unbound
-                        p2p
-
                         epee
                         blocks
-                        miniupnpc
+                        checkpoints
+                        device
+                        multisig
+                        version
 
                         boost_chrono
                         boost_date_time

app/build.gradle

@@ -1,15 +1,14 @@
 apply plugin: 'com.android.application'
-apply plugin: 'witness'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion '26.0.2'
+    buildToolsVersion '27.0.3'
     defaultConfig {
         applicationId "com.m2049r.xmrwallet"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 68
+        versionCode 95
-        versionName "1.3.8 'Satoshis Dream'"
+        versionName "1.5.5 'Accounts Nacho'"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
@@ -17,9 +16,6 @@ android {
                 arguments '-DANDROID_STL=c++_shared'
             }
         }
-        ndk {
-            abiFilters 'armeabi-v7a'
-        }
     }
 
     buildTypes {
@@ -36,49 +32,50 @@ android {
             path "CMakeLists.txt"
         }
     }
+
+    splits {
+        abi {
+            enable true
+            reset()
+            include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+            universalApk true
+        }
+    }
+
+    // Map for the version code that gives each ABI a value.
+    def abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, 'x86': 3, 'x86_64': 4]
+
+    // APKs for the same app that all have the same version information.
+    android.applicationVariants.all { variant ->
+        // Assigns a different version code for each output APK.
+        variant.outputs.all {
+            output ->
+                def abiName = output.getFilter(com.android.build.OutputFile.ABI)
+                output.versionCodeOverride = abiCodes.get(abiName, 0) + 10 * variant.versionCode
+
+                if (abiName == null) abiName = "universal"
+                def v = "${variant.versionName}".replaceFirst(" .*\$", "").replace(".", "x")
+                outputFileName = "$rootProject.ext.apkName-" + v + "_" + abiName + ".apk"
+        }
+    }
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:25.4.0'
+    implementation 'com.android.support:appcompat-v7:25.4.0'
-    compile 'com.android.support:design:25.4.0'
+    implementation 'com.android.support:design:25.4.0'
-    compile 'com.android.support:support-v4:25.4.0'
+    implementation 'com.android.support:support-v4:25.4.0'
-    compile 'com.android.support:recyclerview-v7:25.4.0'
+    implementation 'com.android.support:recyclerview-v7:25.4.0'
-    compile 'com.android.support:cardview-v7:25.4.0'
+    implementation 'com.android.support:cardview-v7:25.4.0'
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation 'me.dm7.barcodescanner:zxing:1.9.8'
-    compile 'me.dm7.barcodescanner:zxing:1.9.8'
 
-    compile "com.squareup.okhttp3:okhttp:$rootProject.ext.okHttpVersion"
+    implementation "com.squareup.okhttp3:okhttp:$rootProject.ext.okHttpVersion"
-    compile "com.jakewharton.timber:timber:$rootProject.ext.timberVersion"
+    implementation "com.jakewharton.timber:timber:$rootProject.ext.timberVersion"
 
-    testCompile "junit:junit:$rootProject.ext.junitVersion"
+    implementation 'com.nulab-inc:zxcvbn:1.2.3'
-    testCompile "org.mockito:mockito-all:$rootProject.ext.mockitoVersion"
+
-    testCompile "com.squareup.okhttp3:mockwebserver:$rootProject.ext.okHttpVersion"
+    testImplementation "junit:junit:$rootProject.ext.junitVersion"
-    testCompile 'org.json:json:20140107'
+    testImplementation "org.mockito:mockito-all:$rootProject.ext.mockitoVersion"
-    testCompile 'net.jodah:concurrentunit:0.4.2'
+    testImplementation "com.squareup.okhttp3:mockwebserver:$rootProject.ext.okHttpVersion"
-}
+    testImplementation 'org.json:json:20140107'
-
+    testImplementation 'net.jodah:concurrentunit:0.4.2'
-dependencyVerification {
-    verify = [
-            'com.android.support:design:3f409bf2019967ffc344cfaf11e52131fac982468a1707aaeb25bf3c52838966',
-            'com.android.support:appcompat-v7:70551e62660db15b790c5275f56b9de4dd9407d1494d07c8f3dd5698f3638677',
-            'com.android.support:transition:848270144fb180efd2bf928a00ed176dbbc5290badfd638390ffba90088df8b3',
-            'me.dm7.barcodescanner:zxing:d43973c9527c23fa8e6d338c6a2c458e373ce1ac6bcaa3bc41d11ae49116000d',
-            'me.dm7.barcodescanner:core:a5c8a704089b58029db166172ed8e55d756877d010a85a0b1c94fdc96ffb8f9a',
-            'com.android.support:support-v4:ee44c481a1f4d6978568e223e8125379b52b2ececdd53450e09ebae144bd377d',
-            'com.android.support:recyclerview-v7:a2fe121f9d01ed8980e97095b4a3fe9700a0aa0a7d4b0f8c594f765ad8455a0d',
-            'com.android.support:cardview-v7:f3fbbe1fcfdbec7333c6a2c516c5fd511a909d1975271818e268d6fe297d8c70',
-            'com.android.support.constraint:constraint-layout:b0c688cc2b7172608f8153a689d746da40f71e52d7e2fe2bfd9df2f92db77085',
-            'com.android.support:animated-vector-drawable:628ab1d56a6ee4cbedf32617af8b2a1fe02964ed0628e8f898cc09ddba6e1835',
-            'com.android.support:support-vector-drawable:077009d13882ee96f061e4bc2dbe7cce7ae1762d8297592a787ff741afbfb1f2',
-            'com.android.support:support-fragment:316d35d4d2d2902057efad104a73e4bdb50bee260a7075678185b8cd71170945',
-            'com.android.support:support-core-ui:e72ae29b823889686cff6fcb948d6745c2baf6d4c2af4fdffa1ec1e42e3833a3',
-            'com.android.support:support-media-compat:566a161d9cb0083ef62a53e46b71ce5b3d455b8635b1a0a4ae28d96d4b583de8',
-            'com.android.support:support-core-utils:34b8437dfa95ff28d29cf57ffa3b1354a9fa9bfe4059f0fd5ce2f5e4326a1748',
-            'com.android.support:support-compat:54019c63614ce08b02d7b9605490cd2b29ba5b2505f394a9517450b5f72b30ca',
-            'com.android.support:support-annotations:a774272036941b4e912eb426d70c848bde7f06a3bf5fb491f75a427dc6595270',
-            'com.android.support.constraint:constraint-layout-solver:8c62525a9bc5cff5633a96cb9b32fffeccaf41b8841aa87fc22607070dea9b8d',
-            'com.google.zxing:core:bba7724e02a997cec38213af77133ee8e24b0d5cf5fa7ecbc16a4fa93f11ee0d',
-            'com.squareup.okio:okio:734269c3ebc5090e3b23566db558f421f0b4027277c79ad5d176b8ec168bb850',
-            'com.squareup.okhttp3:okhttp:7265adbd6f028aade307f58569d814835cd02bc9beffb70c25f72c9de50d61c4',
-    ]
 }

app/src/main/AndroidManifest.xml

@@ -7,6 +7,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
 
     <application
         android:allowBackup="true"

app/src/main/cpp/monerujo.h

@@ -18,6 +18,7 @@
 #define XMRWALLET_WALLET_LIB_H
 
 #include <jni.h>
+
 /*
 #include <android/log.h>
 
@@ -27,13 +28,13 @@
 #define  LOGE(...)  __android_log_print(ANDROID_LOG_ERROR,LOG_TAG,__VA_ARGS__)
 */
 
-jfieldID getHandleField(JNIEnv *env, jobject obj, const char* fieldName = "handle") {
+jfieldID getHandleField(JNIEnv *env, jobject obj, const char *fieldName = "handle") {
     jclass c = env->GetObjectClass(obj);
     return env->GetFieldID(c, fieldName, "J"); // of type long
 }
 
-template <typename T>
+template<typename T>
-T *getHandle(JNIEnv *env, jobject obj, const char* fieldName = "handle") {
+T *getHandle(JNIEnv *env, jobject obj, const char *fieldName = "handle") {
     jlong handle = env->GetLongField(obj, getHandleField(env, obj, fieldName));
     return reinterpret_cast<T *>(handle);
 }
@@ -42,10 +43,35 @@ void setHandleFromLong(JNIEnv *env, jobject obj, jlong handle) {
     env->SetLongField(obj, getHandleField(env, obj), handle);
 }
 
-template <typename T>
+template<typename T>
 void setHandle(JNIEnv *env, jobject obj, T *t) {
     jlong handle = reinterpret_cast<jlong>(t);
     setHandleFromLong(env, obj, handle);
 }
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+// 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);
+
+inline void slow_hash(const void *data, const size_t length, char *hash) {
+    cn_slow_hash(data, length, hash, 0 /* variant */, 0/*prehashed*/);
+}
+
+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*/);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif //XMRWALLET_WALLET_LIB_H

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

@@ -300,7 +300,7 @@ public class ReceiveFragment extends Fragment {
         String paymentId = etPaymentId.getEditText().getText().toString();
         String xmrAmount = evAmount.getAmount();
         Timber.d("%s/%s/%s", xmrAmount, paymentId, address);
-        if ((xmrAmount == null) || !Wallet.isAddressValid(address, WalletManager.getInstance().isTestNet())) {
+        if ((xmrAmount == null) || !Wallet.isAddressValid(address)) {
             clearQR();
             Timber.d("CLEARQR");
             return;
@@ -335,6 +335,7 @@ public class ReceiveFragment extends Fragment {
     }
 
     public Bitmap generate(String text, int width, int height) {
+        if ((width <= 0) || (height <= 0)) return null;
         Map<EncodeHintType, Object> hints = new HashMap<>();
         hints.put(EncodeHintType.CHARACTER_SET, "utf-8");
         hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.M);

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

@@ -59,6 +59,7 @@ public class TxFragment extends Fragment {
         TS_FORMATTER.setTimeZone(tz);
     }
 
+    private TextView tvAccount;
     private TextView tvTxTimestamp;
     private TextView tvTxId;
     private TextView tvTxKey;
@@ -88,6 +89,7 @@ public class TxFragment extends Fragment {
         tvDestinationBtc = (TextView) view.findViewById(R.id.tvDestinationBtc);
         tvTxAmountBtc = (TextView) view.findViewById(R.id.tvTxAmountBtc);
 
+        tvAccount = (TextView) view.findViewById(R.id.tvAccount);
         tvTxTimestamp = (TextView) view.findViewById(R.id.tvTxTimestamp);
         tvTxId = (TextView) view.findViewById(R.id.tvTxId);
         tvTxKey = (TextView) view.findViewById(R.id.tvTxKey);
@@ -222,6 +224,8 @@ public class TxFragment extends Fragment {
         activityCallback.setSubtitle(getString(R.string.tx_title));
         activityCallback.setToolbarButton(Toolbar.BUTTON_BACK);
 
+        tvAccount.setText("" + info.subaddrAccount);
+
         tvTxTimestamp.setText(TS_FORMATTER.format(new Date(info.timestamp * 1000)));
         tvTxId.setText(info.hash);
         tvTxKey.setText(info.txKey.isEmpty() ? "-" : info.txKey);
@@ -236,9 +240,6 @@ public class TxFragment extends Fragment {
         String sign = (info.direction == TransactionInfo.Direction.Direction_In ? "+" : "-");
 
         long realAmount = info.amount;
-        if (info.isPending) {
-            realAmount = realAmount - info.fee;
-        }
         tvTxAmount.setText(sign + Wallet.getDisplayAmount(realAmount));
 
         if ((info.fee > 0)) {

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

@@ -43,9 +43,7 @@ import com.m2049r.xmrwallet.model.Wallet;
 import com.m2049r.xmrwallet.service.exchange.api.ExchangeApi;
 import com.m2049r.xmrwallet.service.exchange.api.ExchangeCallback;
 import com.m2049r.xmrwallet.service.exchange.api.ExchangeRate;
-import com.m2049r.xmrwallet.service.exchange.kraken.ExchangeApiImpl;
 import com.m2049r.xmrwallet.util.Helper;
-import com.m2049r.xmrwallet.util.OkHttpClientSingleton;
 import com.m2049r.xmrwallet.widget.Toolbar;
 
 import java.text.NumberFormat;
@@ -101,7 +99,9 @@ public class WalletFragment extends Fragment
         ivSynced = (ImageView) view.findViewById(R.id.ivSynced);
 
         sCurrency = (Spinner) view.findViewById(R.id.sCurrency);
-        sCurrency.setAdapter(ArrayAdapter.createFromResource(getContext(), R.array.currency, R.layout.item_spinner_balance));
+        ArrayAdapter currencyAdapter = ArrayAdapter.createFromResource(getContext(), R.array.currency, R.layout.item_spinner_balance);
+        currencyAdapter.setDropDownViewResource(R.layout.item_spinner_dropdown_item);
+        sCurrency.setAdapter(currencyAdapter);
 
         bSend = (Button) view.findViewById(R.id.bSend);
         bReceive = (Button) view.findViewById(R.id.bReceive);
@@ -150,7 +150,7 @@ public class WalletFragment extends Fragment
         // at this point selection is XMR in case of error
         String displayB;
         double amountA = Double.parseDouble(Wallet.getDisplayAmount(unlockedBalance)); // crash if this fails!
-        if (!"XMR".equals(balanceCurrency)) { // not XMR
+        if (!Helper.CRYPTO.equals(balanceCurrency)) { // not XMR
             double amountB = amountA * balanceRate;
             displayB = Helper.getFormattedAmount(amountB, false);
         } else { // XMR
@@ -159,10 +159,10 @@ public class WalletFragment extends Fragment
         tvBalance.setText(displayB);
     }
 
-    String balanceCurrency = "XMR";
+    String balanceCurrency = Helper.CRYPTO;
     double balanceRate = 1.0;
 
-    private final ExchangeApi exchangeApi = new ExchangeApiImpl(OkHttpClientSingleton.getOkHttpClient());
+    private final ExchangeApi exchangeApi = Helper.getExchangeApi();
 
     void refreshBalance() {
         if (sCurrency.getSelectedItemPosition() == 0) { // XMR
@@ -170,9 +170,10 @@ public class WalletFragment extends Fragment
             tvBalance.setText(Helper.getFormattedAmount(amountXmr, true));
         } else { // not XMR
             String currency = (String) sCurrency.getSelectedItem();
+            Timber.d(currency);
             if (!currency.equals(balanceCurrency) || (balanceRate <= 0)) {
                 showExchanging();
-                exchangeApi.queryExchangeRate("XMR", currency,
+                exchangeApi.queryExchangeRate(Helper.CRYPTO, currency,
                         new ExchangeCallback() {
                             @Override
                             public void onSuccess(final ExchangeRate exchangeRate) {
@@ -228,10 +229,10 @@ public class WalletFragment extends Fragment
 
     public void exchange(final ExchangeRate exchangeRate) {
         hideExchanging();
-        if (!"XMR".equals(exchangeRate.getBaseCurrency())) {
+        if (!Helper.CRYPTO.equals(exchangeRate.getBaseCurrency())) {
             Timber.e("Not XMR");
             sCurrency.setSelection(0, true);
-            balanceCurrency = "XMR";
+            balanceCurrency = Helper.CRYPTO;
             balanceRate = 1.0;
         } else {
             int spinnerPosition = ((ArrayAdapter) sCurrency.getAdapter()).getPosition(exchangeRate.getQuoteCurrency());
@@ -256,7 +257,7 @@ public class WalletFragment extends Fragment
     // called from activity
 
     public void onRefreshed(final Wallet wallet, final boolean full) {
-        Timber.d("onRefreshed()");
+        Timber.d("onRefreshed(%b)", full);
         if (full) {
             List<TransactionInfo> list = wallet.getHistory().getAll();
             adapter.setInfos(list);
@@ -270,6 +271,7 @@ public class WalletFragment extends Fragment
             bSend.setVisibility(View.VISIBLE);
             bSend.setEnabled(true);
         }
+        enableAccountsList(true);
     }
 
     boolean walletLoaded = false;
@@ -313,7 +315,7 @@ public class WalletFragment extends Fragment
         if (wallet == null) return;
         walletTitle = wallet.getName();
         String watchOnly = (wallet.isWatchOnly() ? getString(R.string.label_watchonly) : "");
-        walletSubtitle = wallet.getAddress().substring(0, 10) + "…" + watchOnly;
+        walletSubtitle = wallet.getAccountLabel();
         activityCallback.setTitle(walletTitle, walletSubtitle);
         Timber.d("wallet title is %s", walletTitle);
     }
@@ -323,10 +325,13 @@ public class WalletFragment extends Fragment
     private String walletSubtitle = null;
     private long unlockedBalance = 0;
 
+    private int accountIdx = -1;
+
     private void updateStatus(Wallet wallet) {
         if (!isAdded()) return;
         Timber.d("updateStatus()");
-        if (walletTitle == null) {
+        if ((walletTitle == null) || (accountIdx != wallet.getAccountIndex())) {
+            accountIdx = wallet.getAccountIndex();
             setActivityTitle(wallet);
         }
         long balance = wallet.getBalance();
@@ -352,7 +357,7 @@ public class WalletFragment extends Fragment
                 setProgress(x);
                 ivSynced.setVisibility(View.GONE);
             } else {
-                sync = getString(R.string.status_synced) + formatter.format(wallet.getBlockChainHeight());
+                sync = getString(R.string.status_synced) + " " + formatter.format(wallet.getBlockChainHeight());
                 ivSynced.setVisibility(View.VISIBLE);
             }
         } else {
@@ -412,9 +417,27 @@ public class WalletFragment extends Fragment
         super.onResume();
         Timber.d("onResume()");
         activityCallback.setTitle(walletTitle, walletSubtitle);
-        activityCallback.setToolbarButton(Toolbar.BUTTON_CLOSE);
+        //activityCallback.setToolbarButton(Toolbar.BUTTON_CLOSE); // TODO: Close button somewhere else
+        activityCallback.setToolbarButton(Toolbar.BUTTON_NONE);
         setProgress(syncProgress);
         setProgress(syncText);
         showReceive();
     }
+
+    @Override
+    public void onPause() {
+        enableAccountsList(false);
+        super.onPause();
+    }
+
+    public interface DrawerLocker {
+        void setDrawerEnabled(boolean enabled);
+    }
+
+    private void enableAccountsList(boolean enable) {
+        if (activityCallback instanceof DrawerLocker) {
+            ((DrawerLocker) activityCallback).setDrawerEnabled(enable);
+        }
+    }
+
 }

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

@@ -19,13 +19,15 @@ package com.m2049r.xmrwallet;
 
 import android.app.Application;
 
+import com.m2049r.xmrwallet.util.Helper;
+
 import timber.log.Timber;
 
 public class XmrWalletApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-
+        
         if (BuildConfig.DEBUG) {
             Timber.plant(new Timber.DebugTree());
         }

app/src/main/java/com/m2049r/xmrwallet/data/BarcodeData.java

@@ -18,6 +18,7 @@ package com.m2049r.xmrwallet.data;
 
 import android.net.Uri;
 
+import com.m2049r.xmrwallet.model.NetworkType;
 import com.m2049r.xmrwallet.model.Wallet;
 import com.m2049r.xmrwallet.model.WalletManager;
 import com.m2049r.xmrwallet.util.BitcoinAddressValidator;
@@ -178,7 +179,7 @@ public class BarcodeData {
                 return null; // we have an amount but its not a number!
             }
         }
-        if (!BitcoinAddressValidator.validate(address, WalletManager.getInstance().isTestNet())) {
+        if (!BitcoinAddressValidator.validate(address)) {
             Timber.d("address invalid");
             return null;
         }
@@ -190,7 +191,7 @@ public class BarcodeData {
 
         if (address == null) return null;
 
-        if (!BitcoinAddressValidator.validate(address, WalletManager.getInstance().isTestNet())) {
+        if (!BitcoinAddressValidator.validate(address)) {
             Timber.d("address invalid");
             return null;
         }

app/src/main/java/com/m2049r/xmrwallet/data/WalletNode.java

@@ -0,0 +1,112 @@
+/*
+ * 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.data;
+
+import com.m2049r.xmrwallet.model.NetworkType;
+
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+
+public class WalletNode {
+    private final String name;
+    private final String host;
+    private final int port;
+    private final String user;
+    private final String password;
+    private final NetworkType networkType;
+
+    public WalletNode(String walletName, String daemon, NetworkType networkType) {
+        if ((daemon == null) || daemon.isEmpty())
+            throw new IllegalArgumentException("daemon is empty");
+        this.name = walletName;
+        String daemonAddress;
+        String a[] = daemon.split("@");
+        if (a.length == 1) { // no credentials
+            daemonAddress = a[0];
+            user = "";
+            password = "";
+        } else if (a.length == 2) { // credentials
+            String userPassword[] = a[0].split(":");
+            if (userPassword.length != 2)
+                throw new IllegalArgumentException("User:Password invalid");
+            user = userPassword[0];
+            if (!user.isEmpty()) {
+                password = userPassword[1];
+            } else {
+                password = "";
+            }
+            daemonAddress = a[1];
+        } else {
+            throw new IllegalArgumentException("Too many @");
+        }
+
+        String da[] = daemonAddress.split(":");
+        if ((da.length > 2) || (da.length < 1))
+            throw new IllegalArgumentException("Too many ':' or too few");
+        host = da[0];
+        if (da.length == 2) {
+            try {
+                port = Integer.parseInt(da[1]);
+            } catch (NumberFormatException ex) {
+                throw new IllegalArgumentException("Port not numeric");
+            }
+        } else {
+            switch (networkType) {
+                case NetworkType_Mainnet:
+                    port = 18081;
+                    break;
+                case NetworkType_Testnet:
+                    port = 28081;
+                    break;
+                case NetworkType_Stagenet:
+                    port = 38081;
+                    break;
+                default:
+                    port = 0;
+            }
+        }
+        this.networkType = networkType;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public NetworkType getNetworkType() {
+        return networkType;
+    }
+
+    public String getAddress() {
+        return host + ":" + port;
+    }
+
+    public String getUsername() {
+        return user;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public SocketAddress getSocketAddress() {
+        return new InetSocketAddress(host, port);
+    }
+
+    public boolean isValid() {
+        return !host.isEmpty();
+    }
+}

app/src/main/java/com/m2049r/xmrwallet/dialog/CreditsFragment.java

@@ -28,16 +28,14 @@ import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.m2049r.xmrwallet.R;
-import com.m2049r.xmrwallet.util.Helper;
 
-public class DonationFragment extends DialogFragment {
+public class CreditsFragment extends DialogFragment {
     static final String TAG = "DonationFragment";
 
-    public static DonationFragment newInstance() {
+    public static CreditsFragment newInstance() {
-        return new DonationFragment();
+        return new CreditsFragment();
     }
 
     public static void display(FragmentManager fm) {
@@ -47,24 +45,14 @@ public class DonationFragment extends DialogFragment {
             ft.remove(prev);
         }
 
-        DonationFragment.newInstance().show(ft, TAG);
+        CreditsFragment.newInstance().show(ft, TAG);
     }
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        final View view = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_donation, null);
+        final View view = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_credits, null);
 
-        ((TextView) view.findViewById(R.id.tvCredits)).setText(Html.fromHtml(getString(R.string.donation_credits)));
+        ((TextView) view.findViewById(R.id.tvCredits)).setText(Html.fromHtml(getString(R.string.credits_text)));
-
-        (view.findViewById(R.id.bCopyAddress)).
-                setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        Helper.clipBoardCopy(getActivity(), getString(R.string.label_copy_address),
-                                ((TextView) view.findViewById(R.id.tvWalletAddress)).getText().toString());
-                        Toast.makeText(getActivity(), getString(R.string.message_copy_address), Toast.LENGTH_SHORT).show();
-                    }
-                });
 
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         builder.setView(view);

app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAddressWizardFragment.java

@@ -212,7 +212,7 @@ public class SendAddressWizardFragment extends SendWizardFragment {
     private boolean checkAddressNoError() {
         String address = etAddress.getEditText().getText().toString();
         return Wallet.isAddressValid(address)
-                || BitcoinAddressValidator.validate(address, WalletManager.getInstance().isTestNet());
+                || BitcoinAddressValidator.validate(address);
     }
 
     private boolean checkAddress() {
@@ -228,13 +228,13 @@ public class SendAddressWizardFragment extends SendWizardFragment {
     private boolean isIntegratedAddress() {
         String address = etAddress.getEditText().getText().toString();
         return (address.length() == INTEGRATED_ADDRESS_LENGTH)
-                && Wallet.isAddressValid(address, WalletManager.getInstance().isTestNet());
+                && Wallet.isAddressValid(address);
     }
 
     private boolean isBitcoinAddress() {
         String address = etAddress.getEditText().getText().toString();
-        if ((address.length() >= 27) && (address.length() <= 34))
+        if ((address.length() >= 27) && (address.length() <= 35))
-            return BitcoinAddressValidator.validate(address, WalletManager.getInstance().isTestNet());
+            return BitcoinAddressValidator.validate(address);
         else
             return false;
     }

app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcAmountWizardFragment.java

@@ -247,7 +247,7 @@ public class SendBtcAmountWizardFragment extends SendWizardFragment {
 
     private XmrToApi xmrToApi = null;
 
-    private final XmrToApi getXmrToApi() {
+    private XmrToApi getXmrToApi() {
         if (xmrToApi == null) {
             synchronized (this) {
                 if (xmrToApi == null) {

app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendFragment.java

@@ -47,6 +47,7 @@ import com.m2049r.xmrwallet.layout.SpendViewPager;
 import com.m2049r.xmrwallet.model.PendingTransaction;
 import com.m2049r.xmrwallet.util.Helper;
 import com.m2049r.xmrwallet.util.NodeList;
+import com.m2049r.xmrwallet.util.Notice;
 import com.m2049r.xmrwallet.util.UserNotes;
 import com.m2049r.xmrwallet.widget.DotBar;
 import com.m2049r.xmrwallet.widget.Toolbar;
@@ -119,27 +120,8 @@ public class SendFragment extends Fragment
         arrowPrev = getResources().getDrawable(R.drawable.ic_navigate_prev_white_24dp);
         arrowNext = getResources().getDrawable(R.drawable.ic_navigate_next_white_24dp);
 
-        llXmrToEnabled = view.findViewById(R.id.llXmrToEnabled);
+        ViewGroup llNotice = (ViewGroup) view.findViewById(R.id.llNotice);
-        llXmrToEnabled.setOnClickListener(new View.OnClickListener() {
+        Notice.showAll(llNotice,".*_send");
-            @Override
-            public void onClick(View v) {
-                HelpFragment.display(getChildFragmentManager(), R.string.help_xmrto);
-
-            }
-        });
-        ibXmrToInfoClose = view.findViewById(R.id.ibXmrToInfoClose);
-        ibXmrToInfoClose.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                llXmrToEnabled.setVisibility(View.GONE);
-                showXmrtoEnabled = false;
-                saveXmrToPrefs();
-            }
-        });
-        loadPrefs();
-        if (!showXmrtoEnabled) {
-            llXmrToEnabled.setVisibility(View.GONE);
-        }
 
         spendViewPager = (SpendViewPager) view.findViewById(R.id.pager);
         pagerAdapter = new SpendPagerAdapter(getChildFragmentManager());
@@ -291,7 +273,7 @@ public class SendFragment extends Fragment
                     pagerAdapter.notifyDataSetChanged();
                 }
             });
-            Timber.d("New Mode = " + mode.toString());
+            Timber.d("New Mode = %s", mode.toString());
         }
     }
 
@@ -350,7 +332,7 @@ public class SendFragment extends Fragment
         @Override
         public SendWizardFragment getItem(int position) {
             Timber.d("getItem(%d) CREATE", position);
-            Timber.d("Mode=" + mode.toString());
+            Timber.d("Mode=%s", mode.toString());
             if (mode == Mode.XMR) {
                 switch (position) {
                     case POS_ADDRESS:

app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendSettingsWizardFragment.java

@@ -54,7 +54,8 @@ public class SendSettingsWizardFragment extends SendWizardFragment {
         TxData getTxData();
     }
 
-    final static int Mixins[] = {4, 7, 12, 25}; // must match the layout XML
+    // Mixin = Ringsize - 1
+    final static int Mixins[] = {6, 9, 12, 25}; // must match the layout XML / "@array/mixin"
     final static PendingTransaction.Priority Priorities[] =
             {PendingTransaction.Priority.Priority_Default,
                     PendingTransaction.Priority.Priority_Low,

app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendSuccessWizardFragment.java

@@ -77,7 +77,7 @@ public class SendSuccessWizardFragment extends SendWizardFragment {
             @Override
             public void onClick(View v) {
                 Helper.clipBoardCopy(getActivity(), getString(R.string.label_send_txid), tvTxId.getText().toString());
-                Toast.makeText(getActivity(), getString(R.string.message_copy_address), Toast.LENGTH_SHORT).show();
+                Toast.makeText(getActivity(), getString(R.string.message_copy_txid), Toast.LENGTH_SHORT).show();
             }
         });
 

app/src/main/java/com/m2049r/xmrwallet/layout/TransactionInfoAdapter.java

@@ -137,12 +137,7 @@ public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfo
                 ivTxType.setVisibility(View.GONE); // gives us more space for the amount
             }
 
-            long realAmount = infoItem.amount;
+            String displayAmount = Helper.getDisplayAmount(infoItem.amount, Helper.DISPLAY_DIGITS_INFO);
-            if (infoItem.isPending) {
-                realAmount = realAmount - infoItem.fee;
-            }
-
-            String displayAmount = Helper.getDisplayAmount(realAmount, Helper.DISPLAY_DIGITS_INFO);
             if (infoItem.direction == TransactionInfo.Direction.Direction_Out) {
                 tvAmount.setText(context.getString(R.string.tx_list_amount_negative, displayAmount));
             } else {

app/src/main/java/com/m2049r/xmrwallet/model/NetworkType.java

@@ -0,0 +1,45 @@
+/*
+ * 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.model;
+
+public enum NetworkType {
+    NetworkType_Mainnet(0),
+    NetworkType_Testnet(1),
+    NetworkType_Stagenet(2);
+
+    public static NetworkType fromInteger(int n) {
+        switch (n) {
+            case 0:
+                return NetworkType_Mainnet;
+            case 1:
+                return NetworkType_Testnet;
+            case 2:
+                return NetworkType_Stagenet;
+        }
+        return null;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    private int value;
+
+    NetworkType(int value) {
+        this.value = value;
+    }
+}

app/src/main/java/com/m2049r/xmrwallet/model/PendingTransaction.java

@@ -84,7 +84,14 @@ public class PendingTransaction {
 
     public native long getFee();
 
-    public native String getFirstTxId();
+    public String getFirstTxId() {
+        String id = getFirstTxIdJ();
+        if (id == null)
+            throw new IndexOutOfBoundsException();
+        return id;
+    }
+
+    public native String getFirstTxIdJ();
 
     public native long getTxCount();
 

app/src/main/java/com/m2049r/xmrwallet/model/TransactionHistory.java

@@ -17,8 +17,11 @@
 package com.m2049r.xmrwallet.model;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
+import timber.log.Timber;
+
 public class TransactionHistory {
     static {
         System.loadLibrary("monerujo");
@@ -26,8 +29,18 @@ public class TransactionHistory {
 
     private long handle;
 
-    public TransactionHistory(long handle) {
+    int accountIndex;
+
+    public void setAccountFor(Wallet wallet) {
+        if (accountIndex != wallet.getAccountIndex()) {
+            this.accountIndex = wallet.getAccountIndex();
+            refreshWithNotes(wallet);
+        }
+    }
+
+    public TransactionHistory(long handle, int accountIndex) {
         this.handle = handle;
+        this.accountIndex = accountIndex;
     }
 
     public void loadNotes(Wallet wallet) {
@@ -36,7 +49,7 @@ public class TransactionHistory {
         }
     }
 
-    public native int getCount();
+    public native int getCount(); // over all accounts/subaddresses
 
     //private native long getTransactionByIndexJ(int i);
 
@@ -53,8 +66,23 @@ public class TransactionHistory {
         loadNotes(wallet);
     }
 
+//    public void refresh() {
+//        transactions = refreshJ();
+//    }
+
     public void refresh() {
-        transactions = refreshJ();
+        List<TransactionInfo> t = refreshJ();
+        Timber.d("refreshed %d", t.size());
+        for (Iterator<TransactionInfo> iterator = t.iterator(); iterator.hasNext(); ) {
+            TransactionInfo info = iterator.next();
+            if (info.subaddrAccount != accountIndex) {
+                iterator.remove();
+                Timber.d("removed %s", info.hash);
+            } else {
+                Timber.d("kept %s", info.hash);
+            }
+        }
+        transactions = t;
     }
 
     private native List<TransactionInfo> refreshJ();

app/src/main/java/com/m2049r/xmrwallet/model/TransactionInfo.java

@@ -53,6 +53,11 @@ public class TransactionInfo implements Parcelable, Comparable<TransactionInfo>
         }
     }
 
+//    virtual std::set<uint32_t> subaddrIndex() const = 0;
+//    virtual uint32_t subaddrAccount() const = 0;
+//    virtual std::string label() const = 0;
+//    virtual uint64_t confirmations() const = 0;
+
     public Direction direction;
     public boolean isPending;
     public boolean isFailed;
@@ -62,6 +67,7 @@ public class TransactionInfo implements Parcelable, Comparable<TransactionInfo>
     public String hash;
     public long timestamp;
     public String paymentId;
+    public int subaddrAccount;
     public long confirmations;
     public List<Transfer> transfers;
 
@@ -78,6 +84,7 @@ public class TransactionInfo implements Parcelable, Comparable<TransactionInfo>
             String hash,
             long timestamp,
             String paymentId,
+            int subaddrAccount,
             long confirmations,
             List<Transfer> transfers) {
         this.direction = Direction.values()[direction];
@@ -89,6 +96,7 @@ public class TransactionInfo implements Parcelable, Comparable<TransactionInfo>
         this.hash = hash;
         this.timestamp = timestamp;
         this.paymentId = paymentId;
+        this.subaddrAccount = subaddrAccount;
         this.confirmations = confirmations;
         this.transfers = transfers;
     }
@@ -108,6 +116,7 @@ public class TransactionInfo implements Parcelable, Comparable<TransactionInfo>
         out.writeString(hash);
         out.writeLong(timestamp);
         out.writeString(paymentId);
+        out.writeInt(subaddrAccount);
         out.writeLong(confirmations);
         out.writeList(transfers);
         out.writeString(txKey);
@@ -134,6 +143,7 @@ public class TransactionInfo implements Parcelable, Comparable<TransactionInfo>
         hash = in.readString();
         timestamp = in.readLong();
         paymentId = in.readString();
+        subaddrAccount = in.readInt();
         confirmations = in.readLong();
         transfers = in.readArrayList(Transfer.class.getClassLoader());
         txKey = in.readString();

app/src/main/java/com/m2049r/xmrwallet/model/Wallet.java

@@ -20,12 +20,24 @@ import com.m2049r.xmrwallet.data.TxData;
 
 import java.io.File;
 
+import timber.log.Timber;
+
 public class Wallet {
     static {
         System.loadLibrary("monerujo");
     }
 
-    static final String TAG = "Wallet";
+    private int accountIndex = 0;
+
+    public int getAccountIndex() {
+        return accountIndex;
+    }
+
+    public void setAccountIndex(int accountIndex) {
+        Timber.d("setAccountIndex(%d)", accountIndex);
+        this.accountIndex = accountIndex;
+        getHistory().setAccountFor(this);
+    }
 
     public String getName() {
         return new File(getPath()).getName();
@@ -38,6 +50,11 @@ public class Wallet {
         this.handle = handle;
     }
 
+    Wallet(long handle, int accountIndex) {
+        this.handle = handle;
+        this.accountIndex = accountIndex;
+    }
+
     public enum Status {
         Status_Ok,
         Status_Error,
@@ -66,20 +83,19 @@ public class Wallet {
 
     public native boolean setPassword(String password);
 
-    private String address = null;
-
     public String getAddress() {
-        if (address == null) {
+        return getAddressJ(accountIndex);
-            address = getAddressJ();
-        }
-        return address;
     }
 
-    private native String getAddressJ();
+    private native String getAddressJ(int accountIndex);
 
     public native String getPath();
 
-    public native boolean isTestNet();
+    public NetworkType getNetworkType() {
+        return NetworkType.fromInteger(nettype());
+    }
+
+    public native int nettype();
 
 //TODO virtual void hardForkInfo(uint8_t &version, uint64_t &earliest_height) const = 0;
 //TODO virtual bool useForkRules(uint8_t version, int64_t early_blocks) const = 0;
@@ -128,9 +144,21 @@ public class Wallet {
 //TODO virtual void setTrustedDaemon(bool arg) = 0;
 //TODO virtual bool trustedDaemon() const = 0;
 
-    public native long getBalance();
+    public long getBalance() {
+        return getBalance(accountIndex);
+    }
 
-    public native long getUnlockedBalance();
+    public native long getBalance(int accountIndex);
+
+    public native long getBalanceAll();
+
+    public long getUnlockedBalance() {
+        return getUnlockedBalance(accountIndex);
+    }
+
+    public native long getUnlockedBalanceAll();
+
+    public native long getUnlockedBalance(int accountIndex);
 
     public native boolean isWatchOnly();
 
@@ -155,14 +183,12 @@ public class Wallet {
     public static native boolean isPaymentIdValid(String payment_id);
 
     public static boolean isAddressValid(String address) {
-        return isAddressValid(address, WalletManager.getInstance().isTestNet());
+        return isAddressValid(address, WalletManager.getInstance().getNetworkType().getValue());
     }
 
-    public static native boolean isAddressValid(String address, boolean isTestNet);
+    public static native boolean isAddressValid(String address, int networkType);
 
-//TODO static static bool keyValid(const std::string &secret_key_string, const std::string &address_string, bool isViewKey, bool testnet, std::string &error);
+    public static native String getPaymentIdFromAddress(String address, int networkType);
-
-    public static native String getPaymentIdFromAddress(String address, boolean isTestNet);
 
     public static native long getMaximumAllowedAmount();
 
@@ -205,14 +231,15 @@ public class Wallet {
                                                 PendingTransaction.Priority priority) {
         disposePendingTransaction();
         int _priority = priority.getValue();
-        long txHandle = createTransactionJ(dst_addr, payment_id, amount, mixin_count, _priority);
+        long txHandle = createTransactionJ(dst_addr, payment_id, amount, mixin_count, _priority,
+                accountIndex);
         pendingTransaction = new PendingTransaction(txHandle);
         return pendingTransaction;
     }
 
     private native long createTransactionJ(String dst_addr, String payment_id,
                                            long amount, int mixin_count,
-                                           int priority);
+                                           int priority, int accountIndex);
 
 
     public PendingTransaction createSweepUnmixableTransaction() {
@@ -239,7 +266,7 @@ public class Wallet {
 
     public TransactionHistory getHistory() {
         if (history == null) {
-            history = new TransactionHistory(getHistoryJ());
+            history = new TransactionHistory(getHistoryJ(), accountIndex);
         }
         return history;
     }
@@ -271,5 +298,43 @@ public class Wallet {
 //virtual bool parse_uri(const std::string &uri, std::string &address, std::string &payment_id, uint64_t &tvAmount, std::string &tx_description, std::string &recipient_name, std::vector<std::string> &unknown_parameters, std::string &error) = 0;
 //virtual bool rescanSpent() = 0;
 
+    private static final String NEW_ACCOUNT_NAME = "Untitled account"; // src/wallet/wallet2.cpp:941
 
+    public void addAccount() {
+        addAccount(NEW_ACCOUNT_NAME);
+    }
+
+    public native void addAccount(String label);
+
+    public String getAccountLabel() {
+        return getAccountLabel(accountIndex);
+    }
+
+    public String getAccountLabel(int accountIndex) {
+        String label = getSubaddressLabel(accountIndex, 0);
+        if (label.equals(NEW_ACCOUNT_NAME)) {
+            String address = getAddressJ(accountIndex);
+            int len = address.length();
+            return address.substring(0, 6) +
+                    "\u2026" + address.substring(len - 6, len);
+        } else return label;
+    }
+
+    public native String getSubaddressLabel(int accountIndex, int addressIndex);
+
+    public void setAccountLabel(String label) {
+        setSubaddressLabel(accountIndex, 0, label);
+    }
+
+    public void setAccountLabel(int accountIndex, String label) {
+        setSubaddressLabel(accountIndex, 0, label);
+    }
+
+    public native void setSubaddressLabel(int accountIndex, int addressIndex, String label);
+
+    public int numAccounts() {
+        return numSubaddressAccounts();
+    }
+
+    public native int numSubaddressAccounts();
 }

app/src/main/java/com/m2049r/xmrwallet/model/WalletManager.java

@@ -16,6 +16,8 @@
 
 package com.m2049r.xmrwallet.model;
 
+import com.m2049r.xmrwallet.data.WalletNode;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
@@ -39,6 +41,7 @@ public class WalletManager {
         if (WalletManager.Instance == null) {
             WalletManager.Instance = new WalletManager();
         }
+
         return WalletManager.Instance;
     }
 
@@ -69,22 +72,29 @@ public class WalletManager {
     }
 
     public Wallet createWallet(File aFile, String password, String language) {
-        long walletHandle = createWalletJ(aFile.getAbsolutePath(), password, language, isTestNet());
+        long walletHandle = createWalletJ(aFile.getAbsolutePath(), password, language, getNetworkType().getValue());
         Wallet wallet = new Wallet(walletHandle);
         manageWallet(wallet);
         return wallet;
     }
 
-    private native long createWalletJ(String path, String password, String language, boolean isTestNet);
+    private native long createWalletJ(String path, String password, String language, int networkType);
+
+    public Wallet openAccount(String path, int accountIndex, String password) {
+        long walletHandle = openWalletJ(path, password, getNetworkType().getValue());
+        Wallet wallet = new Wallet(walletHandle, accountIndex);
+        manageWallet(wallet);
+        return wallet;
+    }
 
     public Wallet openWallet(String path, String password) {
-        long walletHandle = openWalletJ(path, password, isTestNet());
+        long walletHandle = openWalletJ(path, password, getNetworkType().getValue());
         Wallet wallet = new Wallet(walletHandle);
         manageWallet(wallet);
         return wallet;
     }
 
-    private native long openWalletJ(String path, String password, boolean isTestNet);
+    private native long openWalletJ(String path, String password, int networkType);
 
     public Wallet recoveryWallet(File aFile, String password, String mnemonic) {
         return recoveryWallet(aFile, password, mnemonic, 0);
@@ -92,28 +102,28 @@ public class WalletManager {
 
     public Wallet recoveryWallet(File aFile, String password, String mnemonic, long restoreHeight) {
         long walletHandle = recoveryWalletJ(aFile.getAbsolutePath(), password, mnemonic,
-                isTestNet(), restoreHeight);
+                getNetworkType().getValue(), restoreHeight);
         Wallet wallet = new Wallet(walletHandle);
         manageWallet(wallet);
         return wallet;
     }
 
     private native long recoveryWalletJ(String path, String password, String mnemonic,
-                                        boolean isTestNet, long restoreHeight);
+                                        int networkType, long restoreHeight);
 
     public Wallet createWalletWithKeys(File aFile, String password, String language, long restoreHeight,
                                        String addressString, String viewKeyString, String spendKeyString) {
-        long walletHandle = createWalletWithKeysJ(aFile.getAbsolutePath(), password,
+        long walletHandle = createWalletFromKeysJ(aFile.getAbsolutePath(), password,
-                language, isTestNet(), restoreHeight,
+                language, getNetworkType().getValue(), restoreHeight,
                 addressString, viewKeyString, spendKeyString);
         Wallet wallet = new Wallet(walletHandle);
         manageWallet(wallet);
         return wallet;
     }
 
-    private native long createWalletWithKeysJ(String path, String password,
+    private native long createWalletFromKeysJ(String path, String password,
                                               String language,
-                                              boolean isTestNet,
+                                              int networkType,
                                               long restoreHeight,
                                               String addressString,
                                               String viewKeyString,
@@ -204,29 +214,27 @@ public class WalletManager {
 //TODO virtual bool checkPayment(const std::string &address, const std::string &txid, const std::string &txkey, const std::string &daemon_address, uint64_t &received, uint64_t &height, std::string &error) const = 0;
 
     private String daemonAddress = null;
-    private boolean testnet = true;
+    private NetworkType networkType = null;
 
-    public boolean isTestNet() {
+    public NetworkType getNetworkType() {
-        if (daemonAddress == null) {
+        return networkType;
-            return true;
-            // assume testnet not explicitly initialised
-            //throw new IllegalStateException("use setDaemon() to initialise daemon and net first!");
-        }
-        return testnet;
     }
 
-    public void setDaemon(String address, boolean testnet, String username, String password) {
+    //public void setDaemon(String address, NetworkType networkType, String username, String password) {
-        //Timber.d("SETDAEMON " + username + "/" + password + "/" + address);
+    public void setDaemon(WalletNode walletNode) {
-        this.daemonAddress = address;
+        this.daemonAddress = walletNode.getAddress();
-        this.testnet = testnet;
+        this.networkType = walletNode.getNetworkType();
-        this.daemonUsername = username;
+        this.daemonUsername = walletNode.getUsername();
-        this.daemonPassword = password;
+        this.daemonPassword = walletNode.getPassword();
-        setDaemonAddressJ(address);
+        setDaemonAddressJ(daemonAddress);
+    }
+
+    public void setNetworkType(NetworkType networkType) {
+        this.networkType = networkType;
     }
 
     public String getDaemonAddress() {
         if (daemonAddress == null) {
-            // assume testnet not explicitly initialised
             throw new IllegalStateException("use setDaemon() to initialise daemon and net first!");
         }
         return this.daemonAddress;
@@ -234,13 +242,13 @@ public class WalletManager {
 
     private native void setDaemonAddressJ(String address);
 
-    String daemonUsername = "";
+    private String daemonUsername = "";
 
     public String getDaemonUsername() {
         return daemonUsername;
     }
 
-    String daemonPassword = "";
+    private String daemonPassword = "";
 
     public String getDaemonPassword() {
         return daemonPassword;
@@ -268,5 +276,23 @@ public class WalletManager {
 
 //TODO static std::tuple<bool, std::string, std::string, std::string, std::string> checkUpdates(const std::string &software, const std::string &subdir);
 
+    static public native void initLogger(String argv0, String defaultLogBaseName);
 
+    //TODO: maybe put these in an enum like in monero core - but why?
+    static public int LOGLEVEL_SILENT = -1;
+    static public int LOGLEVEL_WARN = 0;
+    static public int LOGLEVEL_INFO = 1;
+    static public int LOGLEVEL_DEBUG = 2;
+    static public int LOGLEVEL_TRACE = 3;
+    static public int LOGLEVEL_MAX = 4;
+
+    static public native void setLogLevel(int level);
+
+    static public native void logDebug(String category, String message);
+
+    static public native void logInfo(String category, String message);
+
+    static public native void logWarning(String category, String message);
+
+    static public native void logError(String category, String message);
 }