bump version to 1.11.13

reduce restore height some more for new wallets

app/CMakeLists.txt

@@ -137,7 +137,11 @@ set_target_properties(checkpoints PROPERTIES IMPORTED_LOCATION
 
 add_library(device STATIC IMPORTED)
 set_target_properties(device PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libdevice.a)
+        ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libdevice.a)
+
+add_library(device_trezor STATIC IMPORTED)
+set_target_properties(device_trezor PROPERTIES IMPORTED_LOCATION
+        ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libdevice_trezor.a)
 
 add_library(multisig STATIC IMPORTED)
 set_target_properties(multisig PROPERTIES IMPORTED_LOCATION
@@ -147,6 +151,10 @@ add_library(version STATIC IMPORTED)
 set_target_properties(version PROPERTIES IMPORTED_LOCATION
     ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libversion.a)
 
+add_library(net STATIC IMPORTED)
+set_target_properties(net PROPERTIES IMPORTED_LOCATION
+        ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libnet.a)
+
 #############
 # System
 #############
@@ -166,6 +174,7 @@ target_link_libraries(  monerujo
                         mnemonics
                         ringct
                         ringct_basic
+                        net
                         common
                         cncrypto
                         blockchain_db
@@ -176,6 +185,7 @@ target_link_libraries(  monerujo
                         blocks
                         checkpoints
                         device
+                        device_trezor
                         multisig
                         version
 

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.m2049r.xmrwallet"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 175
-        versionName "1.11.5 'Chernushka'"
+        versionCode 183
+        versionName "1.11.13 'Chernushka'"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {

app/src/main/cpp/device_io_monerujo.hpp

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

app/src/main/cpp/monerujo.cpp

@@ -39,6 +39,7 @@ static jclass class_WalletListener;
 static jclass class_TransactionInfo;
 static jclass class_Transfer;
 static jclass class_Ledger;
+static jclass class_WalletStatus;
 
 std::mutex _listenerMutex;
 
@@ -61,6 +62,8 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *jvm, void *reserved) {
             jenv->FindClass("com/m2049r/xmrwallet/model/WalletListener")));
     class_Ledger = static_cast<jclass>(jenv->NewGlobalRef(
             jenv->FindClass("com/m2049r/xmrwallet/ledger/Ledger")));
+    class_WalletStatus = static_cast<jclass>(jenv->NewGlobalRef(
+            jenv->FindClass("com/m2049r/xmrwallet/model/Wallet$Status")));
     return JNI_VERSION_1_6;
 }
 #ifdef __cplusplus
@@ -581,10 +584,25 @@ Java_com_m2049r_xmrwallet_model_Wallet_getStatusJ(JNIEnv *env, jobject instance)
     return wallet->status();
 }
 
-JNIEXPORT jstring JNICALL
-Java_com_m2049r_xmrwallet_model_Wallet_getErrorString(JNIEnv *env, jobject instance) {
+jobject newWalletStatusInstance(JNIEnv *env, int status, const std::string &errorString) {
+    jmethodID init = env->GetMethodID(class_WalletStatus, "<init>",
+                                      "(ILjava/lang/String;)V");
+    jstring _errorString = env->NewStringUTF(errorString.c_str());
+    jobject instance = env->NewObject(class_WalletStatus, init, status, _errorString);
+    env->DeleteLocalRef(_errorString);
+    return instance;
+}
+
+
+JNIEXPORT jobject JNICALL
+Java_com_m2049r_xmrwallet_model_Wallet_statusWithErrorString(JNIEnv *env, jobject instance) {
     Bitmonero::Wallet *wallet = getHandle<Bitmonero::Wallet>(env, instance);
-    return env->NewStringUTF(wallet->errorString().c_str());
+
+    int status;
+    std::string errorString;
+    wallet->statusWithErrorString(status, errorString);
+
+    return newWalletStatusInstance(env, status, errorString);
 }
 
 JNIEXPORT jboolean JNICALL
@@ -1292,7 +1310,6 @@ Java_com_m2049r_xmrwallet_model_PendingTransaction_getFirstTxIdJ(JNIEnv *env, jo
         return nullptr;
 }
 
-
 JNIEXPORT jlong JNICALL
 Java_com_m2049r_xmrwallet_model_PendingTransaction_getTxCount(JNIEnv *env, jobject instance) {
     Bitmonero::PendingTransaction *tx = getHandle<Bitmonero::PendingTransaction>(env, instance);
@@ -1378,12 +1395,15 @@ Java_com_m2049r_xmrwallet_model_WalletManager_setLogLevel(JNIEnv *env, jclass cl
     Bitmonero::WalletManagerFactory::setLogLevel(level);
 }
 
+JNIEXPORT jstring JNICALL
+Java_com_m2049r_xmrwallet_model_WalletManager_moneroVersion(JNIEnv *env, jclass clazz) {
+    return env->NewStringUTF(MONERO_VERSION);
+}
+
 //
 // Ledger Stuff
 //
 
-#include "device_io_monerujo.hpp"
-
 /**
  * @brief LedgerExchange - exchange data with Ledger Device
  * @param command        - buffer for data to send
@@ -1417,7 +1437,7 @@ int LedgerExchange(
         return -1;
     }
     jsize len = jenv->GetArrayLength(dataRecv);
-    LOGD("LedgerExchange SCARD_S_SUCCESS %ld/%d", cmd_len, len);
+    LOGD("LedgerExchange SCARD_S_SUCCESS %u/%d", cmd_len, len);
     if (len <= max_resp_len) {
         jenv->GetByteArrayRegion(dataRecv, 0, len, (jbyte *) response);
         jenv->DeleteLocalRef(dataRecv);

app/src/main/cpp/monerujo.h

@@ -54,6 +54,8 @@ extern "C"
 {
 #endif
 
+extern const char* const MONERO_VERSION; // the actual monero core version
+
 // from monero-core crypto/hash-ops.h - avoid #including monero code here
 enum {
     HASH_SIZE = 32,

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

@@ -46,8 +46,12 @@ public class BTChipTransportAndroidHID implements BTChipTransport {
         HashMap<String, UsbDevice> deviceList = manager.getDeviceList();
         for (UsbDevice device : deviceList.values()) {
             Timber.d("%04X:%04X %s, %s", device.getVendorId(), device.getProductId(), device.getManufacturerName(), device.getProductName());
-            if ((device.getVendorId() == VID) && (device.getProductId() == PID_HID)) {
-                return device;
+            if (device.getVendorId() == VID) {
+                final int deviceProductId = device.getProductId();
+                for (int pid : PID_HIDS) {
+                    if (deviceProductId == pid)
+                        return device;
+                }
             }
         }
         return null;
@@ -74,7 +78,7 @@ public class BTChipTransportAndroidHID implements BTChipTransport {
     }
 
     private static final int VID = 0x2C97;
-    private static final int PID_HID = 0x0001;
+    private static final int[] PID_HIDS = {0x0001, 0x0004};
 
     private UsbDeviceConnection connection;
     private UsbInterface dongleInterface;

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

@@ -682,8 +682,7 @@ public class GenerateFragment extends Fragment {
             }
         });
 
-        // set FLAG_SECURE to prevent screenshots in Release Mode
-        if (!(BuildConfig.DEBUG && BuildConfig.FLAVOR_type.equals("alpha"))) {
+        if (Helper.preventScreenshot()) {
             ledgerDialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
         }
 

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

@@ -55,6 +55,8 @@ import com.m2049r.xmrwallet.util.KeyStoreHelper;
 import com.m2049r.xmrwallet.util.MoneroThreadPoolExecutor;
 import com.m2049r.xmrwallet.widget.Toolbar;
 
+import java.text.NumberFormat;
+
 import timber.log.Timber;
 
 public class GenerateReviewFragment extends Fragment {
@@ -72,6 +74,7 @@ public class GenerateReviewFragment extends Fragment {
     private TextView tvWalletPassword;
     private TextView tvWalletAddress;
     private TextView tvWalletMnemonic;
+    private TextView tvWalletHeight;
     private TextView tvWalletViewKey;
     private TextView tvWalletSpendKey;
     private ImageButton bCopyAddress;
@@ -99,6 +102,7 @@ public class GenerateReviewFragment extends Fragment {
         tvWalletViewKey = view.findViewById(R.id.tvWalletViewKey);
         tvWalletSpendKey = view.findViewById(R.id.tvWalletSpendKey);
         tvWalletMnemonic = view.findViewById(R.id.tvWalletMnemonic);
+        tvWalletHeight = view.findViewById(R.id.tvWalletHeight);
         bCopyAddress = view.findViewById(R.id.bCopyAddress);
         bAdvancedInfo = view.findViewById(R.id.bAdvancedInfo);
         llAdvancedInfo = view.findViewById(R.id.llAdvancedInfo);
@@ -188,11 +192,12 @@ public class GenerateReviewFragment extends Fragment {
     private class AsyncShow extends AsyncTask<String, Void, Boolean> {
         String name;
         String address;
+        long height;
         String seed;
         String viewKey;
         String spendKey;
         boolean isWatchOnly;
-        Wallet.Status status;
+        Wallet.Status walletStatus;
 
         boolean dialogOpened = false;
 
@@ -224,14 +229,15 @@ public class GenerateReviewFragment extends Fragment {
                 closeWallet = true;
             }
             name = wallet.getName();
-            status = wallet.getStatus();
-            if (status != Wallet.Status.Status_Ok) {
-                Timber.e(wallet.getErrorString());
+            walletStatus = wallet.getStatus();
+            if (!walletStatus.isOk()) {
+                Timber.e(walletStatus.getErrorString());
                 if (closeWallet) wallet.close();
                 return false;
             }
 
             address = wallet.getAddress();
+            height = wallet.getRestoreHeight();
             seed = wallet.getSeed();
             switch (wallet.getDeviceType()) {
                 case Device_Ledger:
@@ -264,6 +270,7 @@ public class GenerateReviewFragment extends Fragment {
                 llPassword.setVisibility(View.VISIBLE);
                 tvWalletPassword.setText(getPassword());
                 tvWalletAddress.setText(address);
+                tvWalletHeight.setText(NumberFormat.getInstance().format(height));
                 if (!seed.isEmpty()) {
                     llMnemonic.setVisibility(View.VISIBLE);
                     tvWalletMnemonic.setText(seed);
@@ -287,10 +294,11 @@ public class GenerateReviewFragment extends Fragment {
                         GenerateReviewFragment.VIEW_TYPE_ACCEPT.equals(type) ? Toolbar.BUTTON_NONE : Toolbar.BUTTON_BACK);
             } else {
                 // TODO show proper error message and/or end the fragment?
-                tvWalletAddress.setText(status.toString());
-                tvWalletMnemonic.setText(status.toString());
-                tvWalletViewKey.setText(status.toString());
-                tvWalletSpendKey.setText(status.toString());
+                tvWalletAddress.setText(walletStatus.toString());
+                tvWalletHeight.setText(walletStatus.toString());
+                tvWalletMnemonic.setText(walletStatus.toString());
+                tvWalletViewKey.setText(walletStatus.toString());
+                tvWalletSpendKey.setText(walletStatus.toString());
             }
             hideProgress();
         }
@@ -414,12 +422,13 @@ public class GenerateReviewFragment extends Fragment {
         }
 
         boolean ok = false;
-        if (wallet.getStatus() == Wallet.Status.Status_Ok) {
+        Wallet.Status walletStatus = wallet.getStatus();
+        if (walletStatus.isOk()) {
             wallet.setPassword(newPassword);
             wallet.store();
             ok = true;
         } else {
-            Timber.e(wallet.getErrorString());
+            Timber.e(walletStatus.getErrorString());
         }
         if (closeWallet) wallet.close();
         return ok;
@@ -621,8 +630,8 @@ public class GenerateReviewFragment extends Fragment {
                 return false;
             }
         });
-        // set FLAG_SECURE to prevent screenshots in Release Mode
-        if (!(BuildConfig.DEBUG && BuildConfig.FLAVOR_type.equals("alpha"))) {
+
+        if (Helper.preventScreenshot()) {
             openDialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
         }
 

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

@@ -918,6 +918,16 @@ public class LoginActivity extends BaseActivity
 
     }
 
+    boolean checkAndCloseWallet(Wallet aWallet) {
+        Wallet.Status walletStatus = aWallet.getStatus();
+        if (!walletStatus.isOk()) {
+            Timber.e(walletStatus.getErrorString());
+            toast(walletStatus.getErrorString());
+        }
+        aWallet.close();
+        return walletStatus.isOk();
+    }
+
     @Override
     public void onGenerate(final String name, final String password) {
         createWallet(name, password,
@@ -929,15 +939,13 @@ public class LoginActivity extends BaseActivity
 
                     @Override
                     public boolean createWallet(File aFile, String password) {
+                        NodeInfo currentNode = getNode();
+                        // get it from the connected node if we have one, and go back ca. 4 days
+                        final long restoreHeight =
+                                (currentNode != null) ? currentNode.getHeight() - 2000 : -1;
                         Wallet newWallet = WalletManager.getInstance()
-                                .createWallet(aFile, password, MNEMONIC_LANGUAGE);
-                        boolean success = (newWallet.getStatus() == Wallet.Status.Status_Ok);
-                        if (!success) {
-                            Timber.e(newWallet.getErrorString());
-                            toast(newWallet.getErrorString());
-                        }
-                        newWallet.close();
-                        return success;
+                                .createWallet(aFile, password, MNEMONIC_LANGUAGE, restoreHeight);
+                        return checkAndCloseWallet(newWallet);
                     }
                 });
     }
@@ -956,13 +964,7 @@ public class LoginActivity extends BaseActivity
                     public boolean createWallet(File aFile, String password) {
                         Wallet newWallet = WalletManager.getInstance()
                                 .recoveryWallet(aFile, password, seed, restoreHeight);
-                        boolean success = (newWallet.getStatus() == Wallet.Status.Status_Ok);
-                        if (!success) {
-                            Timber.e(newWallet.getErrorString());
-                            toast(newWallet.getErrorString());
-                        }
-                        newWallet.close();
-                        return success;
+                        return checkAndCloseWallet(newWallet);
                     }
                 });
     }
@@ -982,13 +984,7 @@ public class LoginActivity extends BaseActivity
                         Wallet newWallet = WalletManager.getInstance()
                                 .createWalletFromDevice(aFile, password,
                                         restoreHeight, "Ledger");
-                        boolean success = (newWallet.getStatus() == Wallet.Status.Status_Ok);
-                        if (!success) {
-                            Timber.e(newWallet.getErrorString());
-                            toast(newWallet.getErrorString());
-                        }
-                        newWallet.close();
-                        return success;
+                        return checkAndCloseWallet(newWallet);
                     }
                 });
     }
@@ -1009,13 +1005,7 @@ public class LoginActivity extends BaseActivity
                         Wallet newWallet = WalletManager.getInstance()
                                 .createWalletWithKeys(aFile, password, MNEMONIC_LANGUAGE, restoreHeight,
                                         address, viewKey, spendKey);
-                        boolean success = (newWallet.getStatus() == Wallet.Status.Status_Ok);
-                        if (!success) {
-                            Timber.e(newWallet.getErrorString());
-                            toast(newWallet.getErrorString());
-                        }
-                        newWallet.close();
-                        return success;
+                        return checkAndCloseWallet(newWallet);
                     }
                 });
     }
@@ -1370,17 +1360,30 @@ public class LoginActivity extends BaseActivity
         if (Ledger.ENABLED)
             try {
                 Ledger.connect(usbManager, usbDevice);
-                registerDetachReceiver();
-                onLedgerAction();
-                runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        Toast.makeText(LoginActivity.this,
-                                getString(R.string.toast_ledger_attached, usbDevice.getProductName()),
-                                Toast.LENGTH_SHORT)
-                                .show();
-                    }
-                });
+                if (!Ledger.check()) {
+                    Ledger.disconnect();
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            Toast.makeText(LoginActivity.this,
+                                    getString(R.string.toast_ledger_start_app, usbDevice.getProductName()),
+                                    Toast.LENGTH_SHORT)
+                                    .show();
+                        }
+                    });
+                } else {
+                    registerDetachReceiver();
+                    onLedgerAction();
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            Toast.makeText(LoginActivity.this,
+                                    getString(R.string.toast_ledger_attached, usbDevice.getProductName()),
+                                    Toast.LENGTH_SHORT)
+                                    .show();
+                        }
+                    });
+                }
             } catch (IOException ex) {
                 runOnUiThread(new Runnable() {
                     @Override

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

@@ -439,10 +439,13 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
             }
             Collections.sort(nodesToTest, NodeInfo.BestNodeComparator);
             NodeInfo bestNode = nodesToTest.get(0);
-            if (bestNode.isValid())
-                return nodesToTest.get(0);
-            else
+            if (bestNode.isValid()) {
+                activityCallback.setNode(bestNode);
+                return bestNode;
+            } else {
+                activityCallback.setNode(null);
                 return null;
+            }
         }
 
         @Override
@@ -450,7 +453,6 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
             if (!isAdded()) return;
             pbNode.setVisibility(View.INVISIBLE);
             llNode.setVisibility(View.VISIBLE);
-            activityCallback.setNode(result);
             if (result != null) {
                 Timber.d("found a good node %s", result.toString());
                 showNode(result);

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

@@ -506,8 +506,8 @@ public class NodeFragment extends Fragment
                     });
                 }
             });
-            // set FLAG_SECURE to prevent screenshots in Release Mode
-            if (!(BuildConfig.DEBUG && BuildConfig.FLAVOR_type.equals("alpha"))) {
+
+            if (Helper.preventScreenshot()) {
                 editDialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
             }
 

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

@@ -302,7 +302,7 @@ public class ReceiveFragment extends Fragment {
         File imagePath = new File(getActivity().getCacheDir(), "images");
         File png = new File(imagePath, "QR.png");
         Uri contentUri = FileProvider.getUriForFile(getActivity(),
-                "com.m2049r.xmrwallet.fileprovider", png);
+                BuildConfig.APPLICATION_ID + ".fileprovider", png);
         if (contentUri != null) {
             Intent shareIntent = new Intent();
             shareIntent.setAction(Intent.ACTION_SEND);
@@ -574,6 +574,7 @@ public class ReceiveFragment extends Fragment {
     @Override
     public void onPause() {
         Timber.d("onPause()");
+        Helper.hideKeyboard(getActivity());
         super.onPause();
     }
 

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

@@ -21,6 +21,7 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 
+import com.m2049r.xmrwallet.util.Helper;
 import com.m2049r.xmrwallet.util.LocaleHelper;
 
 import static android.view.WindowManager.LayoutParams;
@@ -30,8 +31,7 @@ public abstract class SecureActivity extends AppCompatActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        // set FLAG_SECURE to prevent screenshots in Release Mode
-        if (!(BuildConfig.DEBUG && BuildConfig.FLAVOR_type.equals("alpha"))) {
+        if (Helper.preventScreenshot()) {
             getWindow().setFlags(LayoutParams.FLAG_SECURE, LayoutParams.FLAG_SECURE);
         }
     }

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

@@ -71,7 +71,6 @@ public class TxFragment extends Fragment {
     private TextView tvTxFee;
     private TextView tvTxTransfers;
     private TextView etTxNotes;
-    private Button bTxNotes;
 
     // XMRTO stuff
     private View cvXmrTo;
@@ -102,21 +101,9 @@ public class TxFragment extends Fragment {
         tvTxFee = view.findViewById(R.id.tvTxFee);
         tvTxTransfers = view.findViewById(R.id.tvTxTransfers);
         etTxNotes = view.findViewById(R.id.etTxNotes);
-        bTxNotes = view.findViewById(R.id.bTxNotes);
 
         etTxNotes.setRawInputType(InputType.TYPE_CLASS_TEXT);
 
-        bTxNotes.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                info.notes = null; // force reload on next view
-                bTxNotes.setEnabled(false);
-                etTxNotes.setEnabled(false);
-                userNotes.setNote(etTxNotes.getText().toString());
-                activityCallback.onSetNote(info.hash, userNotes.txNotes);
-            }
-        });
-
         tvTxXmrToKey.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -131,14 +118,6 @@ public class TxFragment extends Fragment {
         return view;
     }
 
-    public void onNotesSet(boolean reload) {
-        bTxNotes.setEnabled(true);
-        etTxNotes.setEnabled(true);
-        if (reload) {
-            loadNotes(this.info);
-        }
-    }
-
     void shareTxInfo() {
         if (this.info == null) return;
         StringBuffer sb = new StringBuffer();
@@ -315,7 +294,6 @@ public class TxFragment extends Fragment {
         }
     }
 
-
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -337,9 +315,9 @@ public class TxFragment extends Fragment {
 
         String getTxNotes(String hash);
 
-        String getTxAddress(int major, int minor);
+        boolean setTxNotes(String txId, String txNotes);
 
-        void onSetNote(String txId, String notes);
+        String getTxAddress(int major, int minor);
 
         void setToolbarButton(int type);
 
@@ -357,4 +335,16 @@ public class TxFragment extends Fragment {
                     + " must implement Listener");
         }
     }
-}
+
+    @Override
+    public void onPause() {
+        if (!etTxNotes.getText().toString().equals(userNotes.note)) { // notes have changed
+            // save them
+            userNotes.setNote(etTxNotes.getText().toString());
+            info.notes = userNotes.txNotes;
+            activityCallback.setTxNotes(info.hash, info.notes);
+        }
+        Helper.hideKeyboard(getActivity());
+        super.onPause();
+    }
+}

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

@@ -150,8 +150,13 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
         final WalletFragment walletFragment = (WalletFragment)
                 getSupportFragmentManager().findFragmentByTag(WalletFragment.class.getName());
         if (walletFragment != null) walletFragment.resetDismissedTransactions();
-        updateAccountsBalance();
         forceUpdate();
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                updateAccountsBalance();
+            }
+        });
     }
 
     @Override
@@ -174,6 +179,11 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
         return getWallet().getUserNote(txId);
     }
 
+    @Override
+    public boolean setTxNotes(String txId, String txNotes) {
+        return getWallet().setUserNote(txId, txNotes);
+    }
+
     @Override
     public String getTxAddress(int major, int minor) {
         return getWallet().getSubaddress(major, minor);
@@ -618,23 +628,22 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
     }
 
     @Override
-    public void onWalletStarted(final Wallet.ConnectionStatus connStatus) {
+    public void onWalletStarted(final Wallet.Status walletStatus) {
         runOnUiThread(new Runnable() {
             public void run() {
                 dismissProgressDialog();
-                switch (connStatus) {
-                    case ConnectionStatus_Disconnected:
-                        Toast.makeText(WalletActivity.this, getString(R.string.status_wallet_connect_failed), Toast.LENGTH_LONG).show();
-                        break;
-                    case ConnectionStatus_WrongVersion:
+                if (walletStatus == null) {
+                    // guess what went wrong
+                    Toast.makeText(WalletActivity.this, getString(R.string.status_wallet_connect_failed), Toast.LENGTH_LONG).show();
+                } else {
+                    if (Wallet.ConnectionStatus.ConnectionStatus_WrongVersion == walletStatus.getConnectionStatus())
                         Toast.makeText(WalletActivity.this, getString(R.string.status_wallet_connect_wrongversion), Toast.LENGTH_LONG).show();
-                        break;
-                    case ConnectionStatus_Connected:
-                        break;
+                    else if (!walletStatus.isOk())
+                        Toast.makeText(WalletActivity.this, walletStatus.getErrorString(), Toast.LENGTH_LONG).show();
                 }
             }
         });
-        if (connStatus != Wallet.ConnectionStatus.ConnectionStatus_Connected) {
+        if ((walletStatus == null) || (Wallet.ConnectionStatus.ConnectionStatus_Connected != walletStatus.getConnectionStatus())) {
             finish();
         } else {
             haveWallet = true;
@@ -713,26 +722,6 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
         }
     }
 
-    @Override
-    public void onSetNotes(final boolean success) {
-        try {
-            final TxFragment txFragment = (TxFragment)
-                    getSupportFragmentManager().findFragmentById(R.id.fragment_container);
-            runOnUiThread(new Runnable() {
-                public void run() {
-                    if (!success) {
-                        Toast.makeText(WalletActivity.this, getString(R.string.tx_notes_set_failed), Toast.LENGTH_LONG).show();
-                    }
-                    txFragment.onNotesSet(success);
-                }
-            });
-        } catch (ClassCastException ex) {
-            // not in tx fragment
-            Timber.d(ex.getLocalizedMessage());
-            // never mind
-        }
-    }
-
     @Override
     public void onProgress(final String text) {
         try {
@@ -794,21 +783,6 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
 
     }
 
-    @Override
-    public void onSetNote(String txId, String notes) {
-        if (mIsBound) { // no point in talking to unbound service
-            Intent intent = new Intent(getApplicationContext(), WalletService.class);
-            intent.putExtra(WalletService.REQUEST, WalletService.REQUEST_CMD_SETNOTE);
-            intent.putExtra(WalletService.REQUEST_CMD_SETNOTE_TX, txId);
-            intent.putExtra(WalletService.REQUEST_CMD_SETNOTE_NOTES, notes);
-            startService(intent);
-            Timber.d("SET NOTE request sent");
-        } else {
-            Timber.e("Service not bound");
-        }
-
-    }
-
     @Override
     public void onPrepareSend(final String tag, final TxData txData) {
         if (mIsBound) { // no point in talking to unbound service
@@ -1062,6 +1036,7 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
         } else {
             tvBalance.setText(null);
         }
+        updateAccountsList();
     }
 
     void updateAccountsHeader() {
@@ -1075,8 +1050,11 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
         Menu menu = accountsView.getMenu();
         menu.removeGroup(R.id.accounts_list);
         final int n = wallet.getNumAccounts();
+        final boolean showBalances = (n > 1) && !isStreetMode();
         for (int i = 0; i < n; i++) {
-            final String label = wallet.getAccountLabel(i);
+            final String label = (showBalances ?
+                    getString(R.string.label_account, wallet.getAccountLabel(i), Helper.getDisplayAmount(wallet.getBalance(i), 2))
+                    : wallet.getAccountLabel(i));
             final MenuItem item = menu.add(R.id.accounts_list, getAccountId(i), 2 * i, label);
             item.setIcon(R.drawable.ic_account_balance_wallet_black_24dp);
             if (i == wallet.getAccountIndex())

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

@@ -219,7 +219,7 @@ public class WalletFragment extends Fragment
         if (isExchanging) return; // wait for exchange to finish - it will fire this itself then.
         // at this point selection is XMR in case of error
         String displayB;
-        double amountA = Double.parseDouble(Wallet.getDisplayAmount(unlockedBalance)); // crash if this fails!
+        double amountA = Helper.getDecimalAmount(unlockedBalance).doubleValue();
         if (!Helper.CRYPTO.equals(balanceCurrency)) { // not XMR
             double amountB = amountA * balanceRate;
             displayB = Helper.getFormattedAmount(amountB, false);
@@ -235,10 +235,10 @@ public class WalletFragment extends Fragment
     private final ExchangeApi exchangeApi = Helper.getExchangeApi();
 
     void refreshBalance() {
-        double unconfirmedXmr = Double.parseDouble(Helper.getDisplayAmount(balance - unlockedBalance));
+        double unconfirmedXmr = Helper.getDecimalAmount(balance - unlockedBalance).doubleValue();
         showUnconfirmed(unconfirmedXmr);
         if (sCurrency.getSelectedItemPosition() == 0) { // XMR
-            double amountXmr = Double.parseDouble(Wallet.getDisplayAmount(unlockedBalance)); // assume this cannot fail!
+            double amountXmr = Helper.getDecimalAmount(unlockedBalance).doubleValue();
             showBalance(Helper.getFormattedAmount(amountXmr, true));
         } else { // not XMR
             String currency = (String) sCurrency.getSelectedItem();
@@ -294,7 +294,7 @@ public class WalletFragment extends Fragment
 
     public void exchangeFailed() {
         sCurrency.setSelection(0, true); // default to XMR
-        double amountXmr = Double.parseDouble(Wallet.getDisplayAmount(unlockedBalance)); // assume this cannot fail!
+        double amountXmr = Helper.getDecimalAmount(unlockedBalance).doubleValue();
         showBalance(Helper.getFormattedAmount(amountXmr, true));
         hideExchanging();
     }

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

@@ -46,7 +46,8 @@ import okhttp3.ResponseBody;
 import timber.log.Timber;
 
 public class NodeInfo extends Node {
-    final static public int MIN_MAJOR_VERSION = 9;
+    final static public int MIN_MAJOR_VERSION = 11;
+    final static public String RPC_VERSION = "2.0";
 
     private long height = 0;
     private long timestamp = 0;
@@ -228,9 +229,12 @@ public class NodeInfo extends Node {
                 responseCode = response.code();
                 if (response.isSuccessful()) {
                     ResponseBody respBody = response.body(); // closed through Response object
-                    if ((respBody != null) && (respBody.contentLength() < 1000)) { // sanity check
+                    if ((respBody != null) && (respBody.contentLength() < 2000)) { // sanity check
                         final JSONObject json = new JSONObject(
                                 respBody.string());
+                        String rpcVersion = json.getString("jsonrpc");
+                        if (!RPC_VERSION.equals(rpcVersion))
+                            return false;
                         final JSONObject header = json.getJSONObject(
                                 "result").getJSONObject("block_header");
                         height = header.getLong("height");

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

@@ -28,6 +28,7 @@ import android.widget.TextView;
 
 import com.m2049r.xmrwallet.BuildConfig;
 import com.m2049r.xmrwallet.R;
+import com.m2049r.xmrwallet.util.Helper;
 
 import java.util.Locale;
 
@@ -76,8 +77,7 @@ public class ProgressDialog extends AlertDialog {
 
         super.onCreate(savedInstanceState);
 
-        // set FLAG_SECURE to prevent screenshots in Release Mode
-        if (!(BuildConfig.DEBUG && BuildConfig.FLAVOR_type.equals("alpha"))) {
+        if (Helper.preventScreenshot()) {
             getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
         }
     }

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

@@ -33,7 +33,9 @@ import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ImageButton;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.m2049r.xmrwallet.R;
 import com.m2049r.xmrwallet.data.BarcodeData;
@@ -92,6 +94,7 @@ public class SendAddressWizardFragment extends SendWizardFragment {
     private View llPaymentId;
     private TextView tvXmrTo;
     private View llXmrTo;
+    private ImageButton bPasteAddress;
 
     private boolean resolvingOA = false;
     private boolean resolvingPP = false;
@@ -197,6 +200,21 @@ public class SendAddressWizardFragment extends SendWizardFragment {
             }
         });
 
+        bPasteAddress = view.findViewById(R.id.bPasteAddress);
+        bPasteAddress.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                final String clip = Helper.getClipBoardText(getActivity());
+                if (clip == null) return;
+                // clean it up
+                final String address = clip.replaceAll("[^0-9A-Z-a-z]", "");
+                if (Wallet.isAddressValid(address) || BitcoinAddressValidator.validate(address))
+                    etAddress.getEditText().setText(address);
+                else
+                    Toast.makeText(getActivity(), getString(R.string.send_address_invalid), Toast.LENGTH_SHORT).show();
+            }
+        });
+
         etPaymentId = view.findViewById(R.id.etPaymentId);
         etPaymentId.getEditText().setRawInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
         etPaymentId.getEditText().setOnEditorActionListener(new TextView.OnEditorActionListener() {

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

@@ -437,8 +437,8 @@ public class SendBtcConfirmWizardFragment extends SendWizardFragment implements
                 return false;
             }
         });
-        // set FLAG_SECURE to prevent screenshots in Release Mode
-        if (!(BuildConfig.DEBUG && BuildConfig.FLAVOR_type.equals("alpha"))) {
+
+        if (Helper.preventScreenshot()) {
             passwordDialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
         }
 

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

@@ -324,8 +324,8 @@ public class SendConfirmWizardFragment extends SendWizardFragment implements Sen
                 return false;
             }
         });
-        // set FLAG_SECURE to prevent screenshots in Release Mode
-        if (!(BuildConfig.DEBUG && BuildConfig.FLAVOR_type.equals("alpha"))) {
+
+        if (Helper.preventScreenshot()) {
             passwordDialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
         }
 

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

@@ -30,6 +30,7 @@ import com.m2049r.xmrwallet.model.TransactionInfo;
 import com.m2049r.xmrwallet.util.Helper;
 import com.m2049r.xmrwallet.data.UserNotes;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -154,7 +155,7 @@ public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfo
             }
 
             if ((infoItem.fee > 0)) {
-                String fee = Helper.getDisplayAmount(infoItem.fee, 5);
+                String fee = Helper.getDisplayAmount(infoItem.fee, Helper.DISPLAY_DIGITS_INFO);
                 tvFee.setText(context.getString(R.string.tx_list_fee, fee));
                 tvFee.setVisibility(View.VISIBLE);
             } else {

app/src/main/java/com/m2049r/xmrwallet/ledger/Instruction.java

@@ -134,6 +134,10 @@ public enum Instruction {
         return value;
     }
 
+    public byte getByteValue() {
+        return (byte) (value & 0xFF);
+    }
+
     private int value;
 
     Instruction(int value) {

app/src/main/java/com/m2049r/xmrwallet/ledger/Ledger.java

@@ -27,9 +27,11 @@ import com.btchip.BTChipException;
 import com.btchip.comm.BTChipTransport;
 import com.btchip.comm.android.BTChipTransportAndroidHID;
 import com.m2049r.xmrwallet.BuildConfig;
+import com.m2049r.xmrwallet.model.WalletManager;
 import com.m2049r.xmrwallet.util.Helper;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 
 import timber.log.Timber;
 
@@ -40,9 +42,11 @@ public class Ledger {
     static public final int LOOKAHEAD_SUBADDRESSES = 20;
     static public final String SUBADDRESS_LOOKAHEAD = LOOKAHEAD_ACCOUNTS + ":" + LOOKAHEAD_SUBADDRESSES;
 
+    private static final byte PROTOCOL_VERSION = 0x02;
     public static final int SW_OK = 0x9000;
     public static final int SW_INS_NOT_SUPPORTED = 0x6D00;
     public static final int OK[] = {SW_OK};
+    public static final int MINIMUM_LEDGER_VERSION = (1 << 16) + (3 << 8) + (1); // 1.3.1
 
     public static UsbDevice findDevice(UsbManager usbManager) {
         if (!ENABLED) return null;
@@ -89,6 +93,21 @@ public class Ledger {
         }
     }
 
+    static public boolean check() {
+        if (Instance == null) return false;
+        byte[] moneroVersion = WalletManager.moneroVersion().getBytes(StandardCharsets.US_ASCII);
+
+        try {
+            byte[] resp = Instance.exchangeApduNoOpt(Instruction.INS_RESET, moneroVersion, OK);
+            int deviceVersion = (resp[0] << 16) + (resp[1] << 8) + (resp[2]);
+            if (deviceVersion < MINIMUM_LEDGER_VERSION)
+                return false;
+        } catch (BTChipException ex) { // comm error - probably wrong app started on device
+            return false;
+        }
+        return true;
+    }
+
     final private BTChipTransport transport;
     final private String name;
     private int lastSW = 0;
@@ -112,7 +131,7 @@ public class Ledger {
     synchronized private byte[] exchangeRaw(byte[] apdu) {
         if (transport == null)
             throw new IllegalStateException("No transport (probably closed previously)");
-        Timber.i("exchangeRaw %02x", apdu[1]);
+        Timber.d("exchangeRaw %02x", apdu[1]);
         Instruction ins = Instruction.fromByte(apdu[1]);
         if (listener != null) listener.onInstructionSend(ins, apdu);
         sniffOut(ins, apdu);
@@ -120,7 +139,6 @@ public class Ledger {
         if (listener != null) listener.onInstructionReceive(ins, data);
         sniffIn(data);
         return data;
-
     }
 
     private byte[] exchange(byte[] apdu) throws BTChipException {
@@ -148,68 +166,19 @@ public class Ledger {
         throw new BTChipException("Invalid status", lastSW);
     }
 
-    private byte[] exchangeApdu(byte cla, byte ins, byte p1, byte p2, byte[] data, int acceptedSW[]) throws BTChipException {
-        byte[] apdu = new byte[data.length + 5];
-        apdu[0] = cla;
-        apdu[1] = ins;
-        apdu[2] = p1;
-        apdu[3] = p2;
-        apdu[4] = (byte) (data.length);
-        System.arraycopy(data, 0, apdu, 5, data.length);
+    private byte[] exchangeApduNoOpt(Instruction instruction, byte[] data, int acceptedSW[])
+            throws BTChipException {
+        byte[] apdu = new byte[data.length + 6];
+        apdu[0] = PROTOCOL_VERSION;
+        apdu[1] = instruction.getByteValue();
+        apdu[2] = 0; // p1
+        apdu[3] = 0; // p2
+        apdu[4] = (byte) (data.length + 1); // +1 because the opt byte is part of the data
+        apdu[5] = 0; // opt
+        System.arraycopy(data, 0, apdu, 6, data.length);
         return exchangeCheck(apdu, acceptedSW);
     }
 
-    private byte[] exchangeApdu(byte cla, byte ins, byte p1, byte p2, int length, int acceptedSW[]) throws BTChipException {
-        byte[] apdu = new byte[5];
-        apdu[0] = cla;
-        apdu[1] = ins;
-        apdu[2] = p1;
-        apdu[3] = p2;
-        apdu[4] = (byte) (length);
-        return exchangeCheck(apdu, acceptedSW);
-    }
-
-    private byte[] exchangeApduSplit(byte cla, byte ins, byte p1, byte p2, byte[] data, int acceptedSW[]) throws BTChipException {
-        int offset = 0;
-        byte[] result = null;
-        while (offset < data.length) {
-            int blockLength = ((data.length - offset) > 255 ? 255 : data.length - offset);
-            byte[] apdu = new byte[blockLength + 5];
-            apdu[0] = cla;
-            apdu[1] = ins;
-            apdu[2] = p1;
-            apdu[3] = p2;
-            apdu[4] = (byte) (blockLength);
-            System.arraycopy(data, offset, apdu, 5, blockLength);
-            result = exchangeCheck(apdu, acceptedSW);
-            offset += blockLength;
-        }
-        return result;
-    }
-
-    private byte[] exchangeApduSplit2(byte cla, byte ins, byte p1, byte p2, byte[] data, byte[] data2, int acceptedSW[]) throws BTChipException {
-        int offset = 0;
-        byte[] result = null;
-        int maxBlockSize = 255 - data2.length;
-        while (offset < data.length) {
-            int blockLength = ((data.length - offset) > maxBlockSize ? maxBlockSize : data.length - offset);
-            boolean lastBlock = ((offset + blockLength) == data.length);
-            byte[] apdu = new byte[blockLength + 5 + (lastBlock ? data2.length : 0)];
-            apdu[0] = cla;
-            apdu[1] = ins;
-            apdu[2] = p1;
-            apdu[3] = p2;
-            apdu[4] = (byte) (blockLength + (lastBlock ? data2.length : 0));
-            System.arraycopy(data, offset, apdu, 5, blockLength);
-            if (lastBlock) {
-                System.arraycopy(data2, 0, apdu, 5 + blockLength, data2.length);
-            }
-            result = exchangeCheck(apdu, acceptedSW);
-            offset += blockLength;
-        }
-        return result;
-    }
-
     public interface Listener {
         void onInstructionSend(Instruction ins, byte[] apdu);
 
@@ -251,7 +220,6 @@ public class Ledger {
         if (ins == Instruction.INS_GET_KEY) {
             snoopKey = (apdu[2] == 2);
         }
-
     }
 
     private void sniffIn(byte[] data) {

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

@@ -173,5 +173,4 @@ public class TransactionInfo implements Parcelable, Comparable<TransactionInfo>
             return this.hash.compareTo(another.hash);
         }
     }
-
-}
+}

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

@@ -16,6 +16,9 @@
 
 package com.m2049r.xmrwallet.model;
 
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
 import com.m2049r.xmrwallet.data.TxData;
 
 import java.io.File;
@@ -32,6 +35,47 @@ public class Wallet {
         System.loadLibrary("monerujo");
     }
 
+    static public class Status {
+        Status(int status, String errorString) {
+            this.status = StatusEnum.values()[status];
+            this.errorString = errorString;
+        }
+
+        final private StatusEnum status;
+        final private String errorString;
+        @Nullable
+        private ConnectionStatus connectionStatus; // optional
+
+        public StatusEnum getStatus() {
+            return status;
+        }
+
+        public String getErrorString() {
+            return errorString;
+        }
+
+        public void setConnectionStatus(@Nullable ConnectionStatus connectionStatus) {
+            this.connectionStatus = connectionStatus;
+        }
+
+        @Nullable
+        public ConnectionStatus getConnectionStatus() {
+            return connectionStatus;
+        }
+
+        public boolean isOk() {
+            return (getStatus() == StatusEnum.Status_Ok)
+                    && ((getConnectionStatus() == null) ||
+                    (getConnectionStatus() == ConnectionStatus.ConnectionStatus_Connected));
+        }
+
+        @Override
+        @NonNull
+        public String toString() {
+            return "Wallet.Status: (" + status + "/" + errorString + ", " + connectionStatus;
+        }
+    }
+
     private int accountIndex = 0;
 
     public int getAccountIndex() {
@@ -66,7 +110,7 @@ public class Wallet {
         Device_Ledger
     }
 
-    public enum Status {
+    public enum StatusEnum {
         Status_Ok,
         Status_Error,
         Status_Critical
@@ -85,12 +129,16 @@ public class Wallet {
     public native void setSeedLanguage(String language);
 
     public Status getStatus() {
-        return Wallet.Status.values()[getStatusJ()];
+        return statusWithErrorString();
     }
 
-    private native int getStatusJ();
+    public Status getFullStatus() {
+        Wallet.Status walletStatus = statusWithErrorString();
+        walletStatus.setConnectionStatus(getConnectionStatus());
+        return walletStatus;
+    }
 
-    public native String getErrorString();
+    private native Status statusWithErrorString();
 
     public native boolean setPassword(String password);
 
@@ -353,9 +401,10 @@ public class Wallet {
         if (label.equals(NEW_ACCOUNT_NAME)) {
             String address = getAddress(accountIndex);
             int len = address.length();
-            return address.substring(0, 6) +
+            label = address.substring(0, 6) +
                     "\u2026" + address.substring(len - 6, len);
-        } else return label;
+        }
+        return label;
     }
 
     public String getSubaddressLabel(int addressIndex) {

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

@@ -91,14 +91,16 @@ public class WalletManager {
         managedWallet = null;
     }
 
-    public Wallet createWallet(File aFile, String password, String language) {
+    public Wallet createWallet(File aFile, String password, String language, long height) {
         long walletHandle = createWalletJ(aFile.getAbsolutePath(), password, language, getNetworkType().getValue());
         Wallet wallet = new Wallet(walletHandle);
         manageWallet(wallet);
-        if (wallet.getStatus() == Wallet.Status.Status_Ok) {
+        if (wallet.getStatus().isOk()) {
             // (Re-)Estimate restore height based on what we know
-            long oldHeight = wallet.getRestoreHeight();
-            wallet.setRestoreHeight(RestoreHeight.getInstance().getHeight(new Date()));
+            final long oldHeight = wallet.getRestoreHeight();
+            final long restoreHeight =
+                    (height > -1) ? height : RestoreHeight.getInstance().getHeight(new Date());
+            wallet.setRestoreHeight(restoreHeight);
             Timber.d("Changed Restore Height from %d to %d", oldHeight, wallet.getRestoreHeight());
             wallet.setPassword(password); // this rewrites the keys file (which contains the restore height)
         }
@@ -285,7 +287,8 @@ public class WalletManager {
             this.daemonAddress = null;
             this.daemonUsername = "";
             this.daemonPassword = "";
-            setDaemonAddressJ("");
+            //setDaemonAddressJ(""); // don't disconnect as monero code blocks for many seconds!
+            //TODO: need to do something about that later
         }
     }
 
@@ -351,4 +354,6 @@ public class WalletManager {
     static public native void logWarning(String category, String message);
 
     static public native void logError(String category, String message);
+
+    static public native String moneroVersion();
 }

app/src/main/java/com/m2049r/xmrwallet/service/WalletService.java

@@ -31,6 +31,7 @@ import android.os.IBinder;
 import android.os.Looper;
 import android.os.Message;
 import android.os.Process;
+import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
 import android.support.v4.app.NotificationCompat;
 
@@ -69,10 +70,6 @@ public class WalletService extends Service {
     public static final String REQUEST_CMD_SEND = "send";
     public static final String REQUEST_CMD_SEND_NOTES = "notes";
 
-    public static final String REQUEST_CMD_SETNOTE = "setnote";
-    public static final String REQUEST_CMD_SETNOTE_TX = "tx";
-    public static final String REQUEST_CMD_SETNOTE_NOTES = "notes";
-
     public static final int START_SERVICE = 1;
     public static final int STOP_SERVICE = 2;
 
@@ -224,9 +221,7 @@ public class WalletService extends Service {
 
         void onSendTransactionFailed(String error);
 
-        void onSetNotes(boolean success);
-
-        void onWalletStarted(Wallet.ConnectionStatus walletStatus);
+        void onWalletStarted(Wallet.Status walletStatus);
 
         void onWalletOpen(Wallet.Device device);
     }
@@ -293,9 +288,9 @@ public class WalletService extends Service {
                         if (walletId != null) {
                             showProgress(getString(R.string.status_wallet_loading));
                             showProgress(10);
-                            Wallet.ConnectionStatus connStatus = start(walletId, walletPw);
-                            if (observer != null) observer.onWalletStarted(connStatus);
-                            if (connStatus != Wallet.ConnectionStatus.ConnectionStatus_Connected) {
+                            Wallet.Status walletStatus = start(walletId, walletPw);
+                            if (observer != null) observer.onWalletStarted(walletStatus);
+                            if ((walletStatus == null) || !walletStatus.isOk()) {
                                 errorState = true;
                                 stop();
                             }
@@ -306,7 +301,7 @@ public class WalletService extends Service {
                         boolean rc = myWallet.store();
                         Timber.d("wallet stored: %s with rc=%b", myWallet.getName(), rc);
                         if (!rc) {
-                            Timber.w("Wallet store failed: %s", myWallet.getErrorString());
+                            Timber.w("Wallet store failed: %s", myWallet.getStatus().getErrorString());
                         }
                         if (observer != null) observer.onWalletStored(rc);
                     } else if (cmd.equals(REQUEST_CMD_TX)) {
@@ -368,7 +363,7 @@ public class WalletService extends Service {
                             boolean rc = myWallet.store();
                             Timber.d("wallet stored: %s with rc=%b", myWallet.getName(), rc);
                             if (!rc) {
-                                Timber.w("Wallet store failed: %s", myWallet.getErrorString());
+                                Timber.w("Wallet store failed: %s", myWallet.getStatus().getErrorString());
                             }
                             if (observer != null) observer.onWalletStored(rc);
                             listener.updated = true;
@@ -378,26 +373,6 @@ public class WalletService extends Service {
                             if (observer != null) observer.onSendTransactionFailed(error);
                             return;
                         }
-                    } else if (cmd.equals(REQUEST_CMD_SETNOTE)) {
-                        Wallet myWallet = getWallet();
-                        Timber.d("SET NOTE for wallet: %s", myWallet.getName());
-                        String txId = extras.getString(REQUEST_CMD_SETNOTE_TX);
-                        String notes = extras.getString(REQUEST_CMD_SETNOTE_NOTES);
-                        if ((txId != null) && (notes != null)) {
-                            boolean success = myWallet.setUserNote(txId, notes);
-                            if (!success) {
-                                Timber.e(myWallet.getErrorString());
-                            }
-                            if (observer != null) observer.onSetNotes(success);
-                            if (success) {
-                                boolean rc = myWallet.store();
-                                Timber.d("wallet stored: %s with rc=%b", myWallet.getName(), rc);
-                                if (!rc) {
-                                    Timber.w("Wallet store failed: %s", myWallet.getErrorString());
-                                }
-                                if (observer != null) observer.onWalletStored(rc);
-                            }
-                        }
                     }
                 }
                 break;
@@ -490,7 +465,8 @@ public class WalletService extends Service {
         return true; // true is important so that onUnbind is also called next time
     }
 
-    private Wallet.ConnectionStatus start(String walletName, String walletPassword) {
+    @Nullable
+    private Wallet.Status start(String walletName, String walletPassword) {
         Timber.d("start()");
         startNotfication();
         showProgress(getString(R.string.status_wallet_loading));
@@ -498,11 +474,11 @@ public class WalletService extends Service {
         if (listener == null) {
             Timber.d("start() loadWallet");
             Wallet aWallet = loadWallet(walletName, walletPassword);
-            Wallet.ConnectionStatus connStatus = Wallet.ConnectionStatus.ConnectionStatus_Disconnected;
-            if (aWallet != null) connStatus = aWallet.getConnectionStatus();
-            if (connStatus != Wallet.ConnectionStatus.ConnectionStatus_Connected) {
-                if (aWallet != null) aWallet.close();
-                return connStatus;
+            if (aWallet == null) return null;
+            Wallet.Status walletStatus = aWallet.getFullStatus();
+            if (!walletStatus.isOk()) {
+                aWallet.close();
+                return walletStatus;
             }
             listener = new MyWalletListener();
             listener.start();
@@ -513,7 +489,7 @@ public class WalletService extends Service {
         // if we try to refresh the history here we get occasional segfaults!
         // doesnt matter since we update as soon as we get a new block anyway
         Timber.d("start() done");
-        return Wallet.ConnectionStatus.ConnectionStatus_Connected;
+        return getWallet().getFullStatus();
     }
 
     public void stop() {
@@ -558,10 +534,9 @@ public class WalletService extends Service {
             wallet = walletMgr.openWallet(path, walletPassword);
             showProgress(60);
             Timber.d("wallet opened");
-            Wallet.Status status = wallet.getStatus();
-            Timber.d("wallet status is %s", status);
-            if (status != Wallet.Status.Status_Ok) {
-                Timber.d("wallet status is %s", status);
+            Wallet.Status walletStatus = wallet.getStatus();
+            if (!walletStatus.isOk()) {
+                Timber.d("wallet status is %s", walletStatus);
                 WalletManager.getInstance().close(wallet); // TODO close() failed?
                 wallet = null;
                 // TODO what do we do with the progress??

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

@@ -21,6 +21,7 @@ import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.ClipData;
+import android.content.ClipDescription;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -64,6 +65,7 @@ import com.m2049r.xmrwallet.service.exchange.api.ExchangeApi;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.MalformedURLException;
 import java.net.SocketTimeoutException;
@@ -186,28 +188,23 @@ public class Helper {
         act.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
     }
 
+    static public BigDecimal getDecimalAmount(long amount) {
+        return new BigDecimal(amount).scaleByPowerOfTen(-12);
+    }
+
     static public String getDisplayAmount(long amount) {
         return getDisplayAmount(amount, 12);
     }
 
     static public String getDisplayAmount(long amount, int maxDecimals) {
-        return getDisplayAmount(Wallet.getDisplayAmount(amount), maxDecimals);
-    }
-
-    // amountString must have '.' as decimal point
-    private static String getDisplayAmount(String amountString, int maxDecimals) {
-        int lastZero = 0;
-        int decimal = 0;
-        for (int i = amountString.length() - 1; i >= 0; i--) {
-            if ((lastZero == 0) && (amountString.charAt(i) != '0')) lastZero = i + 1;
-            // TODO i18n
-            if (amountString.charAt(i) == '.') {
-                decimal = i + 1;
-                break;
-            }
-        }
-        int cutoff = Math.min(Math.max(lastZero, decimal + 2), decimal + maxDecimals);
-        return amountString.substring(0, cutoff);
+        // a Java bug does not strip zeros properly if the value is 0
+        if (amount == 0) return "0.00";
+        BigDecimal d = getDecimalAmount(amount)
+                .setScale(maxDecimals, BigDecimal.ROUND_HALF_UP)
+                .stripTrailingZeros();
+        if (d.scale() < 2)
+            d = d.setScale(2, BigDecimal.ROUND_UNNECESSARY);
+        return d.toPlainString();
     }
 
     static public String getFormattedAmount(double amount, boolean isXmr) {
@@ -285,6 +282,21 @@ public class Helper {
         clipboardManager.setPrimaryClip(clip);
     }
 
+    static public String getClipBoardText(Context context) {
+        final ClipboardManager clipboardManager = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
+        try {
+            if (clipboardManager.hasPrimaryClip()
+                    && clipboardManager.getPrimaryClipDescription().hasMimeType(ClipDescription.MIMETYPE_TEXT_PLAIN)) {
+                final ClipData.Item item = clipboardManager.getPrimaryClip().getItemAt(0);
+                return item.getText().toString();
+            }
+        } catch (NullPointerException ex) {
+            // if we have don't find a text in the clipboard
+            return null;
+        }
+        return null;
+    }
+
     static private Animation ShakeAnimation;
 
     static public Animation getShakeAnimation(Context context) {
@@ -556,6 +568,8 @@ public class Helper {
                     tvOpenPrompt.setText(context.getText(R.string.prompt_fingerprint_auth));
                     tvOpenPrompt.setVisibility(View.VISIBLE);
                     FingerprintHelper.authenticate(context, cancelSignal, fingerprintAuthCallback);
+                } else {
+                    etPassword.requestFocus();
                 }
                 Button button = ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_POSITIVE);
                 button.setOnClickListener(new View.OnClickListener() {
@@ -587,8 +601,7 @@ public class Helper {
             }
         });
 
-        // set FLAG_SECURE to prevent screenshots in Release Mode
-        if (!(BuildConfig.DEBUG && BuildConfig.FLAVOR_type.equals("alpha"))) {
+        if (Helper.preventScreenshot()) {
             openDialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
         }
 
@@ -628,4 +641,8 @@ public class Helper {
             StrictMode.setThreadPolicy(currentPolicy);
         }
     }
+
+    static public boolean preventScreenshot() {
+        return !(BuildConfig.DEBUG || BuildConfig.FLAVOR_type.equals("alpha"));
+    }
 }

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

@@ -101,6 +101,10 @@ public class RestoreHeight {
         blockheight.put("2019-01-01", 1738923L);
         blockheight.put("2019-02-01", 1761435L);
         blockheight.put("2019-03-01", 1781681L);
+        blockheight.put("2019-04-01", 1803081L);
+        blockheight.put("2019-05-01", 1824671L);
+        blockheight.put("2019-06-01", 1847005L);
+        blockheight.put("2019-07-01", 1868590L);
     }
 
     public long getHeight(String date) {

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

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/gradientOrange"
+        android:pathData="M19,2h-4.18C14.4,0.84 13.3,0 12,0c-1.3,0 -2.4,0.84 -2.82,2L5,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,4c0,-1.1 -0.9,-2 -2,-2zM12,2c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM19,20L5,20L5,4h2v3h10L17,4h2v16z" />
+</vector>