fix length test (#314)

* new version

* fix balance

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.m2049r.xmrwallet"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 94
-        versionName "1.5.4 'CrAzY Nacho'"
+        versionCode 95
+        versionName "1.5.5 'Accounts Nacho'"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {

app/src/main/cpp/monerujo.cpp

@@ -551,9 +551,10 @@ Java_com_m2049r_xmrwallet_model_Wallet_setPassword(JNIEnv *env, jobject instance
 }
 
 JNIEXPORT jstring JNICALL
-Java_com_m2049r_xmrwallet_model_Wallet_getAddressJ(JNIEnv *env, jobject instance) {
+Java_com_m2049r_xmrwallet_model_Wallet_getAddressJ(JNIEnv *env, jobject instance,
+                                                   jint accountIndex) {
     Bitmonero::Wallet *wallet = getHandle<Bitmonero::Wallet>(env, instance);
-    return env->NewStringUTF(wallet->address().c_str());
+    return env->NewStringUTF(wallet->address((uint32_t) accountIndex).c_str());
 }
 
 JNIEXPORT jstring JNICALL
@@ -646,15 +647,29 @@ Java_com_m2049r_xmrwallet_model_Wallet_getConnectionStatusJ(JNIEnv *env, jobject
 //TODO virtual bool trustedDaemon() const = 0;
 
 JNIEXPORT jlong JNICALL
-Java_com_m2049r_xmrwallet_model_Wallet_getBalance(JNIEnv *env, jobject instance) {
+Java_com_m2049r_xmrwallet_model_Wallet_getBalance(JNIEnv *env, jobject instance,
+                                                  jint accountIndex) {
     Bitmonero::Wallet *wallet = getHandle<Bitmonero::Wallet>(env, instance);
-    return wallet->balance();
+    return wallet->balance((uint32_t) accountIndex);
 }
 
 JNIEXPORT jlong JNICALL
-Java_com_m2049r_xmrwallet_model_Wallet_getUnlockedBalance(JNIEnv *env, jobject instance) {
+Java_com_m2049r_xmrwallet_model_Wallet_getBalanceAll(JNIEnv *env, jobject instance) {
     Bitmonero::Wallet *wallet = getHandle<Bitmonero::Wallet>(env, instance);
-    return wallet->unlockedBalance();
+    return wallet->balanceAll();
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_m2049r_xmrwallet_model_Wallet_getUnlockedBalance(JNIEnv *env, jobject instance,
+                                                          jint accountIndex) {
+    Bitmonero::Wallet *wallet = getHandle<Bitmonero::Wallet>(env, instance);
+    return wallet->unlockedBalance((uint32_t) accountIndex);
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_m2049r_xmrwallet_model_Wallet_getUnlockedBalanceAll(JNIEnv *env, jobject instance) {
+    Bitmonero::Wallet *wallet = getHandle<Bitmonero::Wallet>(env, instance);
+    return wallet->unlockedBalanceAll();
 }
 
 JNIEXPORT jboolean JNICALL
@@ -814,7 +829,8 @@ JNIEXPORT jlong JNICALL
 Java_com_m2049r_xmrwallet_model_Wallet_createTransactionJ(JNIEnv *env, jobject instance,
                                                           jstring dst_addr, jstring payment_id,
                                                           jlong amount, jint mixin_count,
-                                                          jint priority) {
+                                                          jint priority,
+                                                          jint accountIndex) {
 
     const char *_dst_addr = env->GetStringUTFChars(dst_addr, NULL);
     const char *_payment_id = env->GetStringUTFChars(payment_id, NULL);
@@ -823,8 +839,9 @@ Java_com_m2049r_xmrwallet_model_Wallet_createTransactionJ(JNIEnv *env, jobject i
     Bitmonero::Wallet *wallet = getHandle<Bitmonero::Wallet>(env, instance);
 
     Bitmonero::PendingTransaction *tx = wallet->createTransaction(_dst_addr, _payment_id,
-                                                                  amount, mixin_count,
-                                                                  _priority);
+                                                                  amount, (uint32_t) mixin_count,
+                                                                  _priority,
+                                                                  (uint32_t) accountIndex);
 
     env->ReleaseStringUTFChars(dst_addr, _dst_addr);
     env->ReleaseStringUTFChars(payment_id, _payment_id);
@@ -943,6 +960,54 @@ Java_com_m2049r_xmrwallet_model_Wallet_getTxKey(JNIEnv *env, jobject instance,
     return env->NewStringUTF(txKey.c_str());
 }
 
+//virtual void addSubaddressAccount(const std::string& label) = 0;
+JNIEXPORT void JNICALL
+Java_com_m2049r_xmrwallet_model_Wallet_addAccount(JNIEnv *env, jobject instance,
+                                                            jstring label) {
+
+    const char *_label = env->GetStringUTFChars(label, NULL);
+
+    Bitmonero::Wallet *wallet = getHandle<Bitmonero::Wallet>(env, instance);
+    wallet->addSubaddressAccount(_label);
+
+    env->ReleaseStringUTFChars(label, _label);
+}
+
+//virtual std::string getSubaddressLabel(uint32_t accountIndex, uint32_t addressIndex) const = 0;
+JNIEXPORT jstring JNICALL
+Java_com_m2049r_xmrwallet_model_Wallet_getSubaddressLabel(JNIEnv *env, jobject instance,
+                                                          jint accountIndex, jint addressIndex) {
+
+    Bitmonero::Wallet *wallet = getHandle<Bitmonero::Wallet>(env, instance);
+
+    std::string label = wallet->getSubaddressLabel((uint32_t) accountIndex,
+                                                   (uint32_t) addressIndex);
+
+    return env->NewStringUTF(label.c_str());
+}
+
+//virtual void setSubaddressLabel(uint32_t accountIndex, uint32_t addressIndex, const std::string &label) = 0;
+JNIEXPORT void JNICALL
+Java_com_m2049r_xmrwallet_model_Wallet_setSubaddressLabel(JNIEnv *env, jobject instance,
+                                                          jint accountIndex, jint addressIndex,
+                                                          jstring label) {
+
+    const char *_label = env->GetStringUTFChars(label, NULL);
+
+    Bitmonero::Wallet *wallet = getHandle<Bitmonero::Wallet>(env, instance);
+    wallet->setSubaddressLabel(accountIndex, addressIndex, _label);
+
+    env->ReleaseStringUTFChars(label, _label);
+}
+
+// virtual size_t numSubaddressAccounts() const = 0;
+JNIEXPORT jint JNICALL
+Java_com_m2049r_xmrwallet_model_Wallet_numSubaddressAccounts(JNIEnv *env, jobject instance) {
+    Bitmonero::Wallet *wallet = getHandle<Bitmonero::Wallet>(env, instance);
+    return wallet->numSubaddressAccounts();
+}
+
+
 
 //virtual std::string signMessage(const std::string &message) = 0;
 //virtual bool verifySignedMessage(const std::string &message, const std::string &addres, const std::string &signature) const = 0;
@@ -989,7 +1054,7 @@ jobject newTransferList(JNIEnv *env, Bitmonero::TransactionInfo *info) {
 
 jobject newTransactionInfo(JNIEnv *env, Bitmonero::TransactionInfo *info) {
     jmethodID c = env->GetMethodID(class_TransactionInfo, "<init>",
-                                   "(IZZJJJLjava/lang/String;JLjava/lang/String;JLjava/util/List;)V");
+                                   "(IZZJJJLjava/lang/String;JLjava/lang/String;IJLjava/util/List;)V");
     jobject transfers = newTransferList(env, info);
     jstring _hash = env->NewStringUTF(info->hash().c_str());
     jstring _paymentId = env->NewStringUTF(info->paymentId().c_str());
@@ -1003,6 +1068,7 @@ jobject newTransactionInfo(JNIEnv *env, Bitmonero::TransactionInfo *info) {
                                     _hash,
                                     static_cast<jlong> (info->timestamp()),
                                     _paymentId,
+                                    info->subaddrAccount(),
                                     info->confirmations(),
                                     transfers);
     env->DeleteLocalRef(transfers);
@@ -1178,7 +1244,6 @@ Java_com_m2049r_xmrwallet_model_WalletManager_setLogLevel(JNIEnv *env, jobject i
     Bitmonero::WalletManagerFactory::setLogLevel(level);
 }
 
-
 #ifdef __cplusplus
 }
 #endif

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();
@@ -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/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,16 +83,11 @@ public class Wallet {
 
     public native boolean setPassword(String password);
 
-    private String address = null;
-
     public String getAddress() {
-        if (address == null) {
-            address = getAddressJ();
-        }
-        return address;
+        return getAddressJ(accountIndex);
     }
 
-    private native String getAddressJ();
+    private native String getAddressJ(int accountIndex);
 
     public native String getPath();
 
@@ -132,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();
 
@@ -207,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() {
@@ -241,7 +266,7 @@ public class Wallet {
 
     public TransactionHistory getHistory() {
         if (history == null) {
-            history = new TransactionHistory(getHistoryJ());
+            history = new TransactionHistory(getHistoryJ(), accountIndex);
         }
         return history;
     }
@@ -273,4 +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

@@ -80,6 +80,13 @@ public class WalletManager {
 
     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, getNetworkType().getValue());
         Wallet wallet = new Wallet(walletHandle);

app/src/main/java/com/m2049r/xmrwallet/service/exchange/coinmarketcap/ExchangeApiImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 m2049r et al.
+ * Copyright (c) 2017-2018 m2049r et al.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.m2049r.xmrwallet.service.exchange.kraken;
+package com.m2049r.xmrwallet.service.exchange.coinmarketcap;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.VisibleForTesting;
@@ -23,6 +23,7 @@ import com.m2049r.xmrwallet.service.exchange.api.ExchangeApi;
 import com.m2049r.xmrwallet.service.exchange.api.ExchangeCallback;
 import com.m2049r.xmrwallet.service.exchange.api.ExchangeException;
 import com.m2049r.xmrwallet.service.exchange.api.ExchangeRate;
+import com.m2049r.xmrwallet.util.Helper;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -37,6 +38,7 @@ import okhttp3.Request;
 import okhttp3.Response;
 
 public class ExchangeApiImpl implements ExchangeApi {
+    static final String CRYPTO_ID = "328";
 
     @NonNull
     private final OkHttpClient okHttpClient;
@@ -52,7 +54,7 @@ public class ExchangeApiImpl implements ExchangeApi {
     }
 
     public ExchangeApiImpl(@NonNull final OkHttpClient okHttpClient) {
-        this(okHttpClient, HttpUrl.parse("https://api.kraken.com/0/public/Ticker"));
+        this(okHttpClient, HttpUrl.parse("https://api.coinmarketcap.com/v2/ticker/"));
     }
 
     @Override
@@ -67,12 +69,12 @@ public class ExchangeApiImpl implements ExchangeApi {
         boolean inverse = false;
         String fiat = null;
 
-        if (baseCurrency.equals("XMR")) {
+        if (baseCurrency.equals(Helper.CRYPTO)) {
             fiat = quoteCurrency;
             inverse = false;
         }
 
-        if (quoteCurrency.equals("XMR")) {
+        if (quoteCurrency.equals(Helper.CRYPTO)) {
             fiat = baseCurrency;
             inverse = true;
         }
@@ -85,7 +87,8 @@ public class ExchangeApiImpl implements ExchangeApi {
         final boolean swapAssets = inverse;
 
         final HttpUrl url = baseUrl.newBuilder()
-                .addQueryParameter("pair", "XMR" + fiat)
+                .addEncodedPathSegments(CRYPTO_ID + "/")
+                .addQueryParameter("convert", fiat)
                 .build();
 
         final Request httpRequest = createHttpRequest(url);
@@ -101,12 +104,12 @@ public class ExchangeApiImpl implements ExchangeApi {
                 if (response.isSuccessful()) {
                     try {
                         final JSONObject json = new JSONObject(response.body().string());
-                        final JSONArray jsonError = json.getJSONArray("error");
-                        if (jsonError.length() > 0) {
-                            final String errorMsg = jsonError.getString(0);
-                            callback.onError(new ExchangeException(response.code(), errorMsg));
+                        final JSONObject metadata = json.getJSONObject("metadata");
+                        if (!metadata.isNull("error")) {
+                            final String errorMsg = metadata.getString("error");
+                            callback.onError(new ExchangeException(response.code(), (String) errorMsg));
                         } else {
-                            final JSONObject jsonResult = json.getJSONObject("result");
+                            final JSONObject jsonResult = json.getJSONObject("data");
                             reportSuccess(jsonResult, swapAssets, callback);
                         }
                     } catch (JSONException ex) {
@@ -130,7 +133,6 @@ public class ExchangeApiImpl implements ExchangeApi {
         }
     }
 
-
     private Request createHttpRequest(final HttpUrl url) {
         return new Request.Builder()
                 .url(url)

app/src/main/java/com/m2049r/xmrwallet/service/exchange/coinmarketcap/ExchangeRateImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 m2049r et al.
+ * Copyright (c) 2017-2018 m2049r et al.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.m2049r.xmrwallet.service.exchange.kraken;
+package com.m2049r.xmrwallet.service.exchange.coinmarketcap;
 
 import android.support.annotation.NonNull;
 
@@ -25,6 +25,7 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.Iterator;
 import java.util.NoSuchElementException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -37,7 +38,7 @@ class ExchangeRateImpl implements ExchangeRate {
 
     @Override
     public String getServiceName() {
-        return "kraken.com";
+        return "coinmarketcap.com";
     }
 
     @Override
@@ -64,29 +65,21 @@ class ExchangeRateImpl implements ExchangeRate {
 
     ExchangeRateImpl(final JSONObject jsonObject, final boolean swapAssets) throws JSONException, ExchangeException {
         try {
-            final String key = jsonObject.keys().next(); // we expect only one
-            Pattern pattern = Pattern.compile("^X(.*?)Z(.*?)$");
-            Matcher matcher = pattern.matcher(key);
-            if (matcher.find()) {
-                this.baseCurrency = swapAssets ? matcher.group(2) : matcher.group(1);
-                this.quoteCurrency = swapAssets ? matcher.group(1) : matcher.group(2);
-            } else {
-                throw new ExchangeException("no pair returned!");
-            }
-
-            JSONObject pair = jsonObject.getJSONObject(key);
-            JSONArray close = pair.getJSONArray("c");
-            String closePrice = close.getString(0);
-            if (closePrice != null) {
-                try {
-                    double rate = Double.parseDouble(closePrice);
-                    this.rate = swapAssets ? (1 / rate) : rate;
-                } catch (NumberFormatException ex) {
-                    throw new ExchangeException(ex.getLocalizedMessage());
-                }
-            } else {
-                throw new ExchangeException("no close price returned!");
+            final String baseC = jsonObject.getString("symbol");
+            final JSONObject quotes = jsonObject.getJSONObject("quotes");
+            final Iterator<String> keys = quotes.keys();
+            String key = null;
+            // get key which is not USD unless it is the only one
+            while (keys.hasNext()) {
+                key = keys.next();
+                if (!key.equals("USD")) break;
             }
+            final String quoteC = key;
+            baseCurrency = swapAssets ? quoteC : baseC;
+            quoteCurrency = swapAssets ? baseC : quoteC;
+            JSONObject quote = quotes.getJSONObject(key);
+            double price = quote.getDouble("price");
+            this.rate = swapAssets ? (1d / price) : price;
         } catch (NoSuchElementException ex) {
             throw new ExchangeException(ex.getLocalizedMessage());
         }

app/src/main/java/com/m2049r/xmrwallet/util/BitcoinAddressValidator.java

@@ -66,6 +66,8 @@ public class BitcoinAddressValidator {
 
         byte[] result = new byte[25];
         byte[] numBytes = num.toByteArray();
+        if (num.bitLength() > 200) return null;
+
         if (num.bitLength() == 200) {
             System.arraycopy(numBytes, 1, result, 0, 25);
         } else {

app/src/main/java/com/m2049r/xmrwallet/util/FingerprintHelper.java

@@ -2,18 +2,21 @@ package com.m2049r.xmrwallet.util;
 
 import android.app.KeyguardManager;
 import android.content.Context;
-import android.support.v4.hardware.fingerprint.FingerprintManagerCompat;
-import android.support.v4.os.CancellationSignal;
-
-import timber.log.Timber;
+import android.hardware.fingerprint.FingerprintManager;
+import android.os.Build;
+import android.os.CancellationSignal;
 
 public class FingerprintHelper {
 
     public static boolean isDeviceSupported(Context context) {
-        FingerprintManagerCompat fingerprintManager = FingerprintManagerCompat.from(context);
-        KeyguardManager keyguardManager = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            return false;
+        }
 
-        return keyguardManager != null &&
+        FingerprintManager fingerprintManager = context.getSystemService(FingerprintManager.class);
+        KeyguardManager keyguardManager = context.getSystemService(KeyguardManager.class);
+
+        return (keyguardManager != null) && (fingerprintManager != null) &&
                 keyguardManager.isKeyguardSecure() &&
                 fingerprintManager.isHardwareDetected() &&
                 fingerprintManager.hasEnrolledFingerprints();
@@ -29,8 +32,14 @@ public class FingerprintHelper {
     }
 
     public static void authenticate(Context context, CancellationSignal cancelSignal,
-                                    FingerprintManagerCompat.AuthenticationCallback callback) {
-        FingerprintManagerCompat manager = FingerprintManagerCompat.from(context);
-        manager.authenticate(null, 0, cancelSignal, callback, null);
+                                    FingerprintManager.AuthenticationCallback callback) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            return;
+        }
+
+        FingerprintManager manager = context.getSystemService(FingerprintManager.class);
+        if (manager != null) {
+            manager.authenticate(null, cancelSignal, 0, callback, null);
+        }
     }
 }

app/src/main/java/com/m2049r/xmrwallet/util/Helper.java

@@ -31,11 +31,13 @@ import android.graphics.Canvas;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.VectorDrawable;
+import android.hardware.fingerprint.FingerprintManager;
+import android.os.AsyncTask;
+import android.os.Build;
+import android.os.CancellationSignal;
 import android.os.Environment;
 import android.support.design.widget.TextInputLayout;
 import android.support.v4.content.ContextCompat;
-import android.support.v4.hardware.fingerprint.FingerprintManagerCompat;
-import android.support.v4.os.CancellationSignal;
 import android.system.ErrnoException;
 import android.system.Os;
 import android.text.Editable;
@@ -56,6 +58,7 @@ import com.m2049r.xmrwallet.R;
 import com.m2049r.xmrwallet.model.NetworkType;
 import com.m2049r.xmrwallet.model.Wallet;
 import com.m2049r.xmrwallet.model.WalletManager;
+import com.m2049r.xmrwallet.service.exchange.api.ExchangeApi;
 
 import java.io.File;
 import java.io.IOException;
@@ -65,6 +68,7 @@ import java.net.MalformedURLException;
 import java.net.SocketTimeoutException;
 import java.net.URL;
 import java.util.Locale;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.net.ssl.HttpsURLConnection;
 
@@ -72,6 +76,8 @@ import okhttp3.HttpUrl;
 import timber.log.Timber;
 
 public class Helper {
+    static public final String CRYPTO = "XMR";
+
     static private final String WALLET_DIR = "monerujo" + (BuildConfig.DEBUG ? "-debug" : "");
     static private final String HOME_DIR = "monero" + (BuildConfig.DEBUG ? "-debug" : "");
 
@@ -377,6 +383,7 @@ public class Helper {
     }
 
     static AlertDialog openDialog = null; // for preventing opening of multiple dialogs
+    static AsyncTask<Void, Void, Boolean> loginTask = null;
 
     static public void promptPassword(final Context context, final String wallet, boolean fingerprintDisabled, final PasswordAction action) {
         if (openDialog != null) return; // we are already asking for password
@@ -389,13 +396,66 @@ public class Helper {
         final TextInputLayout etPassword = (TextInputLayout) promptsView.findViewById(R.id.etPassword);
         etPassword.setHint(context.getString(R.string.prompt_password, wallet));
 
+        final TextView tvOpenPrompt = (TextView) promptsView.findViewById(R.id.tvOpenPrompt);
+        final Drawable icFingerprint = context.getDrawable(R.drawable.ic_fingerprint);
+        final Drawable icError = context.getDrawable(R.drawable.ic_error_red_36dp);
+        final Drawable icInfo = context.getDrawable(R.drawable.ic_info_green_36dp);
+
         final boolean fingerprintAuthCheck = FingerprintHelper.isFingerPassValid(context, wallet);
 
         final boolean fingerprintAuthAllowed = !fingerprintDisabled && fingerprintAuthCheck;
         final CancellationSignal cancelSignal = new CancellationSignal();
 
-        if (fingerprintAuthAllowed) {
-            promptsView.findViewById(R.id.txtFingerprintAuth).setVisibility(View.VISIBLE);
+        final AtomicBoolean incorrectSavedPass = new AtomicBoolean(false);
+        class LoginWalletTask extends AsyncTask<Void, Void, Boolean> {
+            private String pass;
+            private boolean fingerprintUsed;
+
+            LoginWalletTask(String pass, boolean fingerprintUsed) {
+                this.pass = pass;
+                this.fingerprintUsed = fingerprintUsed;
+            }
+
+            @Override
+            protected void onPreExecute() {
+                tvOpenPrompt.setCompoundDrawablesRelativeWithIntrinsicBounds(icInfo, null, null, null);
+                tvOpenPrompt.setText(context.getText(R.string.prompt_open_wallet));
+                tvOpenPrompt.setVisibility(View.VISIBLE);
+            }
+
+            @Override
+            protected Boolean doInBackground(Void... unused) {
+                return processPasswordEntry(context, wallet, pass, fingerprintUsed, action);
+            }
+
+            @Override
+            protected void onPostExecute(Boolean result) {
+                if (result) {
+                    Helper.hideKeyboardAlways((Activity) context);
+                    cancelSignal.cancel();
+                    openDialog.dismiss();
+                    openDialog = null;
+                } else {
+                    if (fingerprintUsed) {
+                        incorrectSavedPass.set(true);
+                        tvOpenPrompt.setCompoundDrawablesRelativeWithIntrinsicBounds(icError, null, null, null);
+                        tvOpenPrompt.setText(context.getText(R.string.bad_saved_password));
+                    } else {
+                        if (!fingerprintAuthAllowed) {
+                            tvOpenPrompt.setVisibility(View.GONE);
+                        } else if (incorrectSavedPass.get()) {
+                            tvOpenPrompt.setCompoundDrawablesRelativeWithIntrinsicBounds(icError, null, null, null);
+                            tvOpenPrompt.setText(context.getText(R.string.bad_password));
+                        } else {
+                            tvOpenPrompt.setCompoundDrawablesRelativeWithIntrinsicBounds(icFingerprint, null, null, null);
+                            tvOpenPrompt.setText(context.getText(R.string.prompt_fingerprint_auth));
+                        }
+                        etPassword.setError(context.getString(R.string.bad_password));
+                    }
+                }
+
+                loginTask = null;
+            }
         }
 
         etPassword.getEditText().addTextChangedListener(new TextWatcher() {
@@ -427,46 +487,56 @@ public class Helper {
                             public void onClick(DialogInterface dialog, int id) {
                                 Helper.hideKeyboardAlways((Activity) context);
                                 cancelSignal.cancel();
+                                if (loginTask != null) {
+                                    loginTask.cancel(true);
+                                    loginTask = null;
+                                }
                                 dialog.cancel();
                                 openDialog = null;
                             }
                         });
         openDialog = alertDialogBuilder.create();
 
-        final FingerprintManagerCompat.AuthenticationCallback fingerprintAuthCallback = new FingerprintManagerCompat.AuthenticationCallback() {
-            @Override
-            public void onAuthenticationError(int errMsgId, CharSequence errString) {
-                ((TextView) promptsView.findViewById(R.id.txtFingerprintAuth)).setText(errString);
-            }
-
-            @Override
-            public void onAuthenticationSucceeded(FingerprintManagerCompat.AuthenticationResult result) {
-                try {
-                    String userPass = KeyStoreHelper.loadWalletUserPass(context, wallet);
-                    if (Helper.processPasswordEntry(context, wallet, userPass, true, action)) {
-                        Helper.hideKeyboardAlways((Activity) context);
-                        openDialog.dismiss();
-                        openDialog = null;
-                    } else {
-                        etPassword.setError(context.getString(R.string.bad_password));
-                    }
-                } catch (KeyStoreHelper.BrokenPasswordStoreException ex) {
-                    etPassword.setError(context.getString(R.string.bad_password));
-                    // TODO: better errror message here - what would it be?
+        final FingerprintManager.AuthenticationCallback fingerprintAuthCallback;
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            fingerprintAuthCallback = null;
+        } else {
+            fingerprintAuthCallback = new FingerprintManager.AuthenticationCallback() {
+                @Override
+                public void onAuthenticationError(int errMsgId, CharSequence errString) {
+                    tvOpenPrompt.setCompoundDrawablesRelativeWithIntrinsicBounds(icError, null, null, null);
+                    tvOpenPrompt.setText(errString);
                 }
-            }
 
-            @Override
-            public void onAuthenticationFailed() {
-                ((TextView) promptsView.findViewById(R.id.txtFingerprintAuth))
-                        .setText(context.getString(R.string.bad_fingerprint));
-            }
-        };
+                @Override
+                public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) {
+                    try {
+                        String userPass = KeyStoreHelper.loadWalletUserPass(context, wallet);
+                        if (loginTask == null) {
+                            loginTask = new LoginWalletTask(userPass, true);
+                            loginTask.execute();
+                        }
+                    } catch (KeyStoreHelper.BrokenPasswordStoreException ex) {
+                        etPassword.setError(context.getString(R.string.bad_password));
+                        // TODO: better error message here - what would it be?
+                    }
+                }
+
+                @Override
+                public void onAuthenticationFailed() {
+                    tvOpenPrompt.setCompoundDrawablesRelativeWithIntrinsicBounds(icError, null, null, null);
+                    tvOpenPrompt.setText(context.getString(R.string.bad_fingerprint));
+                }
+            };
+        }
 
         openDialog.setOnShowListener(new DialogInterface.OnShowListener() {
             @Override
             public void onShow(DialogInterface dialog) {
-                if (fingerprintAuthAllowed) {
+                if (fingerprintAuthAllowed && fingerprintAuthCallback != null) {
+                    tvOpenPrompt.setCompoundDrawablesRelativeWithIntrinsicBounds(icFingerprint, null, null, null);
+                    tvOpenPrompt.setText(context.getText(R.string.prompt_fingerprint_auth));
+                    tvOpenPrompt.setVisibility(View.VISIBLE);
                     FingerprintHelper.authenticate(context, cancelSignal, fingerprintAuthCallback);
                 }
                 Button button = ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_POSITIVE);
@@ -474,13 +544,9 @@ public class Helper {
                     @Override
                     public void onClick(View view) {
                         String pass = etPassword.getEditText().getText().toString();
-                        if (processPasswordEntry(context, wallet, pass, false, action)) {
-                            Helper.hideKeyboardAlways((Activity) context);
-                            cancelSignal.cancel();
-                            openDialog.dismiss();
-                            openDialog = null;
-                        } else {
-                            etPassword.setError(context.getString(R.string.bad_password));
+                        if (loginTask == null) {
+                            loginTask = new LoginWalletTask(pass, false);
+                            loginTask.execute();
                         }
                     }
                 });
@@ -492,13 +558,9 @@ public class Helper {
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
                 if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) || (actionId == EditorInfo.IME_ACTION_DONE)) {
                     String pass = etPassword.getEditText().getText().toString();
-                    if (processPasswordEntry(context, wallet, pass, false, action)) {
-                        Helper.hideKeyboardAlways((Activity) context);
-                        cancelSignal.cancel();
-                        openDialog.dismiss();
-                        openDialog = null;
-                    } else {
-                        etPassword.setError(context.getString(R.string.bad_password));
+                    if (loginTask == null) {
+                        loginTask = new LoginWalletTask(pass, false);
+                        loginTask.execute();
                     }
                     return true;
                 }
@@ -523,4 +585,9 @@ public class Helper {
             return false;
         }
     }
+
+    static public ExchangeApi getExchangeApi() {
+        return new com.m2049r.xmrwallet.service.exchange.coinmarketcap.ExchangeApiImpl(OkHttpClientSingleton.getOkHttpClient());
+
+    }
 }

app/src/main/java/com/m2049r/xmrwallet/util/KeyStoreHelper.java

@@ -284,7 +284,9 @@ public class KeyStoreHelper {
 
     private static byte[] decrypt(String alias, byte[] data) {
         try {
-            PrivateKey privateKey = getPrivateKeyEntry(alias).getPrivateKey();
+            KeyStore.PrivateKeyEntry pke = getPrivateKeyEntry(alias);
+            if (pke == null) return null;
+            PrivateKey privateKey = pke.getPrivateKey();
             Cipher cipher = Cipher.getInstance(SecurityConstants.CIPHER_RSA_ECB_PKCS1);
 
             cipher.init(Cipher.DECRYPT_MODE, privateKey);
@@ -305,7 +307,8 @@ public class KeyStoreHelper {
      */
     private static byte[] signData(String alias, byte[] data) throws NoSuchAlgorithmException,
             InvalidKeyException, SignatureException {
-
+        KeyStore.PrivateKeyEntry pke = getPrivateKeyEntry(alias);
+        if (pke == null) return null;
         PrivateKey privateKey = getPrivateKeyEntry(alias).getPrivateKey();
         Signature s = Signature.getInstance(SecurityConstants.SIGNATURE_SHA256withRSA);
         s.initSign(privateKey);

app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeTextView.java

@@ -36,9 +36,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 java.util.Locale;
 
@@ -250,7 +248,7 @@ public class ExchangeTextView extends LinearLayout
         }
     }
 
-    private final ExchangeApi exchangeApi = new ExchangeApiImpl(OkHttpClientSingleton.getOkHttpClient());
+    private final ExchangeApi exchangeApi = Helper.getExchangeApi();
 
     void startExchange() {
         showProgress();
@@ -458,4 +456,4 @@ public class ExchangeTextView extends LinearLayout
         tvAmountA.setText(null);
         doExchange();
     }
-}
+}

app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeView.java

@@ -30,6 +30,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
@@ -41,9 +42,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 java.util.Locale;
 
@@ -166,7 +165,11 @@ public class ExchangeView extends LinearLayout
         etAmount = (TextInputLayout) findViewById(R.id.etAmount);
         tvAmountB = (TextView) findViewById(R.id.tvAmountB);
         sCurrencyA = (Spinner) findViewById(R.id.sCurrencyA);
+        ArrayAdapter adapter = ArrayAdapter.createFromResource(getContext(), R.array.currency, R.layout.item_spinner);
+        adapter.setDropDownViewResource(R.layout.item_spinner_dropdown_item);
+        sCurrencyA.setAdapter(adapter);
         sCurrencyB = (Spinner) findViewById(R.id.sCurrencyB);
+        sCurrencyB.setAdapter(adapter);
         evExchange = (ImageView) findViewById(R.id.evExchange);
         pbExchange = (ProgressBar) findViewById(R.id.pbExchange);
 
@@ -310,12 +313,13 @@ public class ExchangeView extends LinearLayout
         }
     }
 
-    private final ExchangeApi exchangeApi = new ExchangeApiImpl(OkHttpClientSingleton.getOkHttpClient());
+    private final ExchangeApi exchangeApi = Helper.getExchangeApi();
 
     void startExchange() {
         showProgress();
         String currencyA = (String) sCurrencyA.getSelectedItem();
         String currencyB = (String) sCurrencyB.getSelectedItem();
+
         exchangeApi.queryExchangeRate(currencyA, currencyB,
                 new ExchangeCallback() {
                     @Override

app/src/main/res/drawable/ic_account_balance_wallet_black_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M21,18v1c0,1.1 -0.9,2 -2,2L5,21c-1.11,0 -2,-0.9 -2,-2L3,5c0,-1.1 0.89,-2 2,-2h14c1.1,0 2,0.9 2,2v1h-9c-1.11,0 -2,0.9 -2,2v8c0,1.1 0.89,2 2,2h9zM12,16h10L22,8L12,8v8zM16,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
+</vector>

app/src/main/res/drawable/ic_add_circle_white.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="20.0"
+    android:viewportWidth="20.0">
+    <path
+        android:fillColor="@color/moneroWhite"
+        android:pathData="M11,5L9,5L9,9L5,9L5,11L9,11L9,15L11,15L11,11L15,11L15,9L11,9L11,5L11,5ZM10,0C4.5,0 0,4.5 0,10C0,15.5 4.5,20 10,20C15.5,20 20,15.5 20,10C20,4.5 15.5,0 10,0L10,0ZM10,18C5.6,18 2,14.4 2,10C2,5.6 5.6,2 10,2C14.4,2 18,5.6 18,10C18,14.4 14.4,18 10,18L10,18Z" />
+</vector>

app/src/main/res/drawable/ic_edit_white_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+</vector>

app/src/main/res/drawable/ic_error_red_36dp.xml

@@ -0,0 +1,27 @@
+<!--
+  ~ Copyright (C) 2015 The Android Open Source Project
+  ~
+  ~ 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
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="36"
+    android:viewportHeight="36" >
+    <path
+        android:fillColor="#f4511e"
+        android:pathData="M18,18m -18, 0a 18, 18 0 1, 0 36, 0a 18, 18 0 1, 0 -36, 0" />
+    <path
+        android:fillColor="#ffffffff"
+        android:pathData="m16.665,24.915001l2.67,0l0,2.67l-2.67,0l0,-2.67zm0,-16.5l2.67,0l0,12.67l-2.67,0l0,-12.67z" />
+</vector>

app/src/main/res/drawable/ic_info_green_36dp.xml

@@ -0,0 +1,27 @@
+<!--
+  ~ Copyright (C) 2015 The Android Open Source Project
+  ~
+  ~ 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
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="36"
+    android:viewportHeight="36" >
+    <path
+        android:fillColor="#009688"
+        android:pathData="M18,18m -18, 0a 18, 18 0 1, 0 36, 0a 18, 18 0 1, 0 -36, 0" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="m16.665,8.415001l2.67,0l0,2.67l-2.67,0l0,-2.67zm0,6.5l2.67,0l0,12.67l-2.67,0l0,-12.67z" />
+</vector>

app/src/main/res/layout/activity_wallet.xml

@@ -1,22 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/backgound_all"
-    android:gravity="center_horizontal"
-    android:orientation="vertical">
+    android:fitsSystemWindows="true">
 
-    <com.m2049r.xmrwallet.widget.Toolbar
-        android:id="@+id/toolbar"
-        style="@style/ToolBarStyle.Event"
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="@drawable/backgound_toolbar_mainnet"
-        android:minHeight="?attr/actionBarSize" />
+        android:layout_height="match_parent"
+        android:background="@drawable/backgound_all"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
 
-    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        <com.m2049r.xmrwallet.widget.Toolbar
+            android:id="@+id/toolbar"
+            style="@style/ToolBarStyle.Event"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/actionBarSize"
+            android:background="@drawable/backgound_toolbar_mainnet"
+            android:minHeight="?android:attr/actionBarSize" />
 
-</LinearLayout>
+        <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:id="@+id/fragment_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </LinearLayout>
+
+    <!-- Container for contents of drawer - use NavigationView to make configuration easier -->
+    <android.support.design.widget.NavigationView
+        android:id="@+id/accounts_nav"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        android:fitsSystemWindows="true"
+        app:headerLayout="@layout/nav_header"
+        app:menu="@menu/drawer_view" />
+
+</android.support.v4.widget.DrawerLayout>

app/src/main/res/layout/fragment_tx_info.xml

@@ -171,6 +171,24 @@
             android:layout_height="match_parent"
             android:shrinkColumns="1">
 
+            <TableRow>
+
+                <TextView
+                    style="@style/MoneroLabel.Small"
+                    android:layout_gravity="center_vertical"
+                    android:gravity="end"
+                    android:padding="8dp"
+                    android:text="@string/tx_account" />
+
+                <TextView
+                    android:id="@+id/tvAccount"
+                    style="@style/MoneroText"
+                    android:gravity="start"
+                    android:padding="8dp"
+                    android:selectAllOnFocus="true"
+                    android:textIsSelectable="true" />
+            </TableRow>
+
             <TableRow>
 
                 <TextView

app/src/main/res/layout/fragment_wallet.xml

@@ -57,6 +57,7 @@
                 android:layout_marginStart="8dp"
                 android:entries="@array/currency"
                 android:gravity="center"
+                android:minWidth="80dp"
                 android:paddingBottom="2dp"
                 android:paddingEnd="4dp"
                 android:paddingStart="4dp"

app/src/main/res/layout/item_spinner.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@android:id/text1"
+    style="?android:attr/spinnerItemStyle"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:ellipsize="marquee"
+    android:gravity="center"
+    android:singleLine="true"
+    tools:text="XMR" />

app/src/main/res/layout/item_spinner_dropdown_item.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    style="?android:attr/spinnerDropDownItemStyle"
+    android:layout_width="match_parent"
+    android:minWidth="64dp"
+    android:layout_height="match_parent"
+    android:ellipsize="marquee"
+    android:padding="4dp"
+    android:singleLine="true"
+    android:textAlignment="center" />

app/src/main/res/layout/nav_header.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="192dp"
+    android:background="@drawable/gradient_all"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <TextView
+        android:id="@+id/tvName"
+        style="@style/MoneroText.Large"
+        android:textColor="@color/moneroWhite"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        tools:text="MyWallet" />
+
+    <TextView
+        android:id="@+id/tvBalance"
+        style="@style/MoneroLabel.Caps.White"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:gravity="end"
+        tools:text="12.34 XMR" />
+
+</RelativeLayout>

app/src/main/res/layout/prompt_password.xml

@@ -23,12 +23,10 @@
     </android.support.design.widget.TextInputLayout>
 
     <TextView
-        android:id="@+id/txtFingerprintAuth"
+        android:id="@+id/tvOpenPrompt"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:drawablePadding="10dp"
-        android:drawableStart="@drawable/ic_fingerprint"
         android:gravity="center_vertical"
-        android:text="@string/prompt_fingerprint_auth"
         android:visibility="gone" />
 </LinearLayout>

app/src/main/res/layout/view_exchange.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:showIn="LinearLayout"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:showIn="LinearLayout">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -12,12 +12,12 @@
 
         <Spinner
             android:id="@+id/sCurrencyA"
-            android:layout_width="56dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:entries="@array/currency"
             android:gravity="center"
-            android:textAlignment="center" />
+            android:minWidth="56dp" />
 
         <com.m2049r.xmrwallet.widget.CTextInputLayout
             android:id="@+id/etAmount"
@@ -49,19 +49,18 @@
         <Spinner
             android:id="@+id/sCurrencyB"
             style="@style/MoneroSpinnerGray"
-            android:layout_width="56sp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:entries="@array/currency"
             android:gravity="center"
-            android:paddingBottom="8dp"
-            android:paddingTop="8dp"
+            android:minWidth="56dp"
             android:textAlignment="center" />
 
         <TextView
             android:id="@+id/tvAmountB"
             style="@style/MoneroText"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center|start"
             android:layout_marginStart="16dp"

app/src/main/res/menu/drawer_view.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <group
+        android:id="@+id/accounts_list"
+        android:checkableBehavior="single"
+        android:orderInCategory="100" />
+    <group
+        android:id="@+id/accounts_new"
+        android:checkableBehavior="none"
+        android:orderInCategory="200">
+        <item
+            android:id="@+id/account_new"
+            android:icon="@drawable/ic_add_circle_white"
+            android:title="@string/accounts_drawer_new" />
+    </group>
+</menu>