bump version

also, revert device type query changes

.idea/gradle.xml

@@ -3,6 +3,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="disableWrapperSourceDistributionNotification" value="true" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">

README.md

@@ -22,12 +22,8 @@ Help us translate Monerujo! You can find instructions [On Taiga](https://taiga.g
 You may lose all your Moneroj if you use this App. Be cautious when spending on the mainnet.
 
 ### Random Notes
-- Based off monero v0.11.1.0
-- currently only android32 (runs on 64-bit as well)
-- works on the testnet & mainnet
-- sync is slow due to 32-bit architecture
+- works on the mainnet & stagenet
 - use your own daemon - it's easy
-- screen stays on until first sync is complete
 - Monerujo means "Monero Wallet" according to https://www.reddit.com/r/Monero/comments/3exy7t/esperanto_corner/
 
 ### TODO
@@ -43,13 +39,8 @@ of the "real" testnet.  After creating a new wallet, make a **new** one by recov
 The official monero client shows the same behaviour.
 
 ### HOW TO BUILD
-No need to build. Binaries are included:
 
-- openssl-1.0.2l
-- monero-v0.12
-- boost_1_58_0
-
-If you want to build them yourself (recommended) check out [the instructions](doc/BUILDING-external-libs.md)
+See [the instructions](doc/BUILDING-external-libs.md)
 
 Then, fire up Android Studio and build the APK.
 

app/.gitignore

@@ -1,3 +1,5 @@
 .externalNativeBuild
 build
 app.iml
+prod
+alpha

app/CMakeLists.txt

@@ -7,13 +7,21 @@ add_library( monerujo
 
 set(EXTERNAL_LIBS_DIR ${CMAKE_SOURCE_DIR}/../external-libs)
 
+############
+# libsodium
+############
+
+add_library(sodium STATIC IMPORTED)
+set_target_properties(sodium PROPERTIES IMPORTED_LOCATION
+        ${EXTERNAL_LIBS_DIR}/libsodium/lib/${ANDROID_ABI}/libsodium.a)
+
 ############
 # OpenSSL
 ############
 
 add_library(crypto STATIC IMPORTED)
 set_target_properties(crypto PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/openssl/lib/${ANDROID_ABI}/libcrypto.a)
+        ${EXTERNAL_LIBS_DIR}/openssl/lib/${ANDROID_ABI}/libcrypto.a)
 
 add_library(ssl STATIC IMPORTED)
 set_target_properties(ssl PROPERTIES IMPORTED_LOCATION
@@ -184,5 +192,7 @@ target_link_libraries(  monerujo
                         ssl
                         crypto
 
+                        sodium
+
                        ${log-lib}
                        )

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.m2049r.xmrwallet"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 123
-        versionName "1.7.3 'OpenAlias'"
+        versionCode 133
+        versionName "1.8.3 'Bullets And Octane-Pirates'"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
@@ -18,6 +18,16 @@ android {
         }
     }
 
+    flavorDimensions "version"
+    productFlavors {
+        alpha {
+            applicationIdSuffix ".alpha"
+            versionNameSuffix " (alpha)"
+        }
+        prod {
+        }
+    }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -27,6 +37,7 @@ android {
             applicationIdSuffix ".debug"
         }
     }
+
     externalNativeBuild {
         cmake {
             path "CMakeLists.txt"
@@ -61,9 +72,13 @@ android {
             output ->
                 def abiName = output.getFilter(com.android.build.OutputFile.ABI)
                 output.versionCodeOverride = abiCodes.get(abiName, 0) + 10 * variant.versionCode
+                //def flavor = output.getFilter(flavor)
 
                 if (abiName == null) abiName = "universal"
-                def v = "${variant.versionName}".replaceFirst(" .*\$", "").replace(".", "x")
+                def v = "${variant.versionName}".replaceFirst(" '.*' ?", "")
+                        .replace(".", "x")
+                        .replace("(", "-")
+                        .replace(")", "")
                 outputFileName = "$rootProject.ext.apkName-" + v + "_" + abiName + ".apk"
         }
     }

app/src/main/cpp/device_io_monerujo.hpp

@@ -0,0 +1,88 @@
+// 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

@@ -416,17 +416,20 @@ Java_com_m2049r_xmrwallet_model_WalletManager_verifyWalletPassword(JNIEnv *env,
 
 //virtual int queryWalletHardware(const std::string &keys_file_name, const std::string &password) const = 0;
 JNIEXPORT jint JNICALL
-Java_com_m2049r_xmrwallet_model_WalletManager_queryWalletHardware(JNIEnv *env, jobject instance,
-                                                                  jstring keys_file_name,
-                                                                  jstring password) {
+Java_com_m2049r_xmrwallet_model_WalletManager_queryWalletDeviceJ(JNIEnv *env, jobject instance,
+                                                                jstring keys_file_name,
+                                                                jstring password) {
     const char *_keys_file_name = env->GetStringUTFChars(keys_file_name, NULL);
     const char *_password = env->GetStringUTFChars(password, NULL);
-    int hardwareId =
-            Bitmonero::WalletManagerFactory::getWalletManager()->
-                    queryWalletHardware(std::string(_keys_file_name), std::string(_password));
+    Bitmonero::Wallet::Device device_type;
+    bool ok = Bitmonero::WalletManagerFactory::getWalletManager()->
+            queryWalletDevice(device_type, std::string(_keys_file_name), std::string(_password));
     env->ReleaseStringUTFChars(keys_file_name, _keys_file_name);
     env->ReleaseStringUTFChars(password, _password);
-    return static_cast<jint>(hardwareId);
+    if (ok)
+        return static_cast<jint>(device_type);
+    else
+        return -1;
 }
 
 JNIEXPORT jobject JNICALL
@@ -775,11 +778,11 @@ Java_com_m2049r_xmrwallet_model_Wallet_isSynchronized(JNIEnv *env, jobject insta
     return static_cast<jboolean>(wallet->synchronized());
 }
 
-JNIEXPORT jboolean JNICALL
-Java_com_m2049r_xmrwallet_model_Wallet_isKeyOnDevice(JNIEnv *env, jobject instance) {
+JNIEXPORT jint JNICALL
+Java_com_m2049r_xmrwallet_model_Wallet_getDeviceTypeJ(JNIEnv *env, jobject instance) {
     Bitmonero::Wallet *wallet = getHandle<Bitmonero::Wallet>(env, instance);
-    bool key_on_device = wallet->isKeyOnDevice();
-    return static_cast<jboolean>(key_on_device);
+    Bitmonero::Wallet::Device device_type = wallet->getDeviceType();
+    return static_cast<jint>(device_type);
 }
 
 //void cn_slow_hash(const void *data, size_t length, char *hash); // from crypto/hash-ops.h
@@ -1383,24 +1386,22 @@ Java_com_m2049r_xmrwallet_model_WalletManager_setLogLevel(JNIEnv *env, jobject i
 // Ledger Stuff
 //
 
-#include "monerujo_ledger.h"
+#include "device_io_monerujo.hpp"
 
 /**
  * @brief LedgerExchange - exchange data with Ledger Device
- * @param pbSendBuffer   - buffer for data to send
- * @param cbSendLength   - length of send buffer
- * @param pbRecvBuffer   - buffer for received data
- * @param pcbRecvLength  - pointer to size of receive buffer
- *                         gets set with length of received data on successful return
- * @return SCARD_S_SUCCESS - success
- *         SCARD_E_NO_READERS_AVAILABLE - no device connected / found
- *         SCARD_E_INSUFFICIENT_BUFFER  - pbRecvBuffer is too small for the response
+ * @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
  */
-LONG LedgerExchange(
-        LPCBYTE pbSendBuffer,
-        DWORD cbSendLength,
-        LPBYTE pbRecvBuffer,
-        LPDWORD pcbRecvLength) {
+int  LedgerExchange(
+        unsigned char *command,
+        unsigned int cmd_len,
+        unsigned char *response,
+        unsigned int max_resp_len) {
     LOGD("LedgerExchange");
     JNIEnv *jenv;
     int envStat = attachJVM(&jenv);
@@ -1408,30 +1409,29 @@ LONG LedgerExchange(
 
     jmethodID exchangeMethod = jenv->GetStaticMethodID(class_Ledger, "Exchange", "([B)[B");
 
-    jsize sendLen = static_cast<jsize>(cbSendLength);
+    jsize sendLen = static_cast<jsize>(cmd_len);
     jbyteArray dataSend = jenv->NewByteArray(sendLen);
-    jenv->SetByteArrayRegion(dataSend, 0, sendLen, (jbyte *) pbSendBuffer);
+    jenv->SetByteArrayRegion(dataSend, 0, sendLen, (jbyte *) command);
     jbyteArray dataRecv = (jbyteArray) jenv->CallStaticObjectMethod(class_Ledger, exchangeMethod,
                                                                     dataSend);
     jenv->DeleteLocalRef(dataSend);
     if (dataRecv == nullptr) {
         detachJVM(jenv, envStat);
         LOGD("LedgerExchange SCARD_E_NO_READERS_AVAILABLE");
-        return SCARD_E_NO_READERS_AVAILABLE;
+        return -1;
     }
     jsize len = jenv->GetArrayLength(dataRecv);
-    LOGD("LedgerExchange SCARD_S_SUCCESS %ld/%d", cbSendLength, len);
-    if (len <= *pcbRecvLength) {
-        *pcbRecvLength = static_cast<DWORD>(len);
-        jenv->GetByteArrayRegion(dataRecv, 0, len, (jbyte *) pbRecvBuffer);
+    LOGD("LedgerExchange SCARD_S_SUCCESS %ld/%d", cmd_len, len);
+    if (len <= max_resp_len) {
+        jenv->GetByteArrayRegion(dataRecv, 0, len, (jbyte *) response);
         jenv->DeleteLocalRef(dataRecv);
         detachJVM(jenv, envStat);
-        return SCARD_S_SUCCESS;
+        return static_cast<int>(len);;
     } else {
         jenv->DeleteLocalRef(dataRecv);
         detachJVM(jenv, envStat);
         LOGE("LedgerExchange SCARD_E_INSUFFICIENT_BUFFER");
-        return SCARD_E_INSUFFICIENT_BUFFER;
+        return -1;
     }
 }
 

app/src/main/cpp/monerujo_ledger.h

@@ -1,46 +0,0 @@
-/**
- * Copyright (c) 2018 m2049r
- * <p>
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.
- */
-
-#ifndef XMRWALLET_LEDGER_H
-#define XMRWALLET_LEDGER_H
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#define SCARD_S_SUCCESS ((LONG)0x00000000) /**< No error was encountered. */
-#define SCARD_E_INSUFFICIENT_BUFFER    ((LONG)0x80100008) /**< The data buffer to receive returned data is too small for the returned data. */
-#define SCARD_E_NO_READERS_AVAILABLE ((LONG)0x8010002E) /**< Cannot find a smart card reader. */
-
-typedef long LONG;
-typedef unsigned long DWORD;
-typedef DWORD *LPDWORD;
-typedef unsigned char BYTE;
-typedef BYTE *LPBYTE;
-typedef const BYTE *LPCBYTE;
-
-typedef char CHAR;
-typedef CHAR *LPSTR;
-
-int LedgerFind(char *buffer, size_t len);
-LONG LedgerExchange(LPCBYTE pbSendBuffer, DWORD cbSendLength, LPBYTE pbRecvBuffer, LPDWORD pcbRecvLength);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif //XMRWALLET_LEDGER_H

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

@@ -200,7 +200,8 @@ public class GenerateReviewFragment extends Fragment {
             super.onPreExecute();
             showProgress();
             if ((walletPath != null)
-                    && (WalletManager.getInstance().queryWalletHardware(walletPath + ".keys", getPassword()) == 1)
+                    && (WalletManager.getInstance().queryWalletDevice(walletPath + ".keys", getPassword())
+                    == Wallet.Device.Device_Ledger)
                     && (progressCallback != null)) {
                 progressCallback.showLedgerProgressDialog(LedgerProgressDialog.TYPE_RESTORE);
                 dialogOpened = true;
@@ -231,10 +232,15 @@ public class GenerateReviewFragment extends Fragment {
 
             address = wallet.getAddress();
             seed = wallet.getSeed();
-            if (wallet.isKeyOnDevice()) {
-                viewKey = Ledger.Key();
-            } else {
-                viewKey = wallet.getSecretViewKey();
+            switch (wallet.getDeviceType()) {
+                case Device_Ledger:
+                    viewKey = Ledger.Key();
+                    break;
+                case Device_Software:
+                    viewKey = wallet.getSecretViewKey();
+                    break;
+                default:
+                    throw new IllegalStateException("Hardware backing not supported. At all!");
             }
             spendKey = isWatchOnly ? getActivity().getString(R.string.label_watchonly) : wallet.getSecretSpendKey();
             isWatchOnly = wallet.isWatchOnly();

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

@@ -1171,18 +1171,27 @@ public class LoginActivity extends BaseActivity
                             String keyPath = new File(Helper.getWalletRoot(LoginActivity.this),
                                     walletName + ".keys").getAbsolutePath();
                             // check if we need connected hardware
-                            int hw = WalletManager.getInstance().queryWalletHardware(keyPath, password);
-                            if ((hw == 1) && (!hasLedger())) {
-                                toast(R.string.open_wallet_ledger_missing);
-                            } else {
-                                // hw could be < 0  meaning the password is wrong - this gets dealt with later
-                                startWallet(walletName, password, fingerprintUsed);
+                            Wallet.Device device =
+                                    WalletManager.getInstance().queryWalletDevice(keyPath, password);
+                            switch (device) {
+                                case Device_Ledger:
+                                    if (!hasLedger()) {
+                                        toast(R.string.open_wallet_ledger_missing);
+                                    } else {
+                                        startWallet(walletName, password, fingerprintUsed);
+                                    }
+                                    break;
+                                default:
+                                    // device could be undefined meaning the password is wrong
+                                    // this gets dealt with later
+                                    startWallet(walletName, password, fingerprintUsed);
                             }
                         }
                     });
         } else { // this cannot really happen as we prefilter choices
             Toast.makeText(this, getString(R.string.bad_wallet), Toast.LENGTH_SHORT).show();
         }
+
     }
 
     // USB Stuff - (Ledger)

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

@@ -320,7 +320,8 @@ public class ReceiveFragment extends Fragment {
             super.onPreExecute();
             showProgress();
             if ((walletPath != null)
-                    && (WalletManager.getInstance().queryWalletHardware(walletPath + ".keys", password) == 1)
+                    && (WalletManager.getInstance().queryWalletDevice(walletPath + ".keys", password)
+                    == Wallet.Device.Device_Ledger)
                     && (progressCallback != null)) {
                 progressCallback.showLedgerProgressDialog(LedgerProgressDialog.TYPE_RESTORE);
                 dialogOpened = true;
@@ -513,7 +514,7 @@ public class ReceiveFragment extends Fragment {
         @Override
         protected void onPreExecute() {
             super.onPreExecute();
-            if (wallet.isKeyOnDevice() && (progressCallback != null)) {
+            if ((wallet.getDeviceType() == Wallet.Device.Device_Ledger) && (progressCallback != null)) {
                 progressCallback.showLedgerProgressDialog(LedgerProgressDialog.TYPE_SUBADDRESS);
                 dialogOpened = true;
             }

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

@@ -51,6 +51,7 @@ import com.m2049r.xmrwallet.dialog.CreditsFragment;
 import com.m2049r.xmrwallet.dialog.HelpFragment;
 import com.m2049r.xmrwallet.fragment.send.SendAddressWizardFragment;
 import com.m2049r.xmrwallet.fragment.send.SendFragment;
+import com.m2049r.xmrwallet.ledger.Ledger;
 import com.m2049r.xmrwallet.ledger.LedgerProgressDialog;
 import com.m2049r.xmrwallet.model.PendingTransaction;
 import com.m2049r.xmrwallet.model.TransactionInfo;
@@ -461,6 +462,11 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
     @Override
     public boolean onRefreshed(final Wallet wallet, final boolean full) {
         Timber.d("onRefreshed()");
+        runOnUiThread(new Runnable() {
+            public void run() {
+                updateAccountsBalance();
+            }
+        });
         if (numAccounts != wallet.getNumAccounts()) {
             numAccounts = wallet.getNumAccounts();
             runOnUiThread(new Runnable() {
@@ -516,26 +522,35 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
     boolean haveWallet = false;
 
     @Override
-    public void onWalletOpen(final int hardware) {
-        if (hardware > 0)
-            runOnUiThread(new Runnable() {
-                public void run() {
-                    showLedgerProgressDialog(LedgerProgressDialog.TYPE_RESTORE);
-                }
-            });
+    public void onWalletOpen(final Wallet.Device device) {
+        switch (device) {
+            case Device_Ledger:
+                runOnUiThread(new Runnable() {
+                    public void run() {
+                        showLedgerProgressDialog(LedgerProgressDialog.TYPE_RESTORE);
+                    }
+                });
+        }
     }
 
     @Override
-    public void onWalletStarted(final boolean success) {
+    public void onWalletStarted(final Wallet.ConnectionStatus connStatus) {
         runOnUiThread(new Runnable() {
             public void run() {
                 dismissProgressDialog();
-                if (!success) {
-                    Toast.makeText(WalletActivity.this, getString(R.string.status_wallet_connect_failed), Toast.LENGTH_LONG).show();
+                switch (connStatus) {
+                    case ConnectionStatus_Disconnected:
+                        Toast.makeText(WalletActivity.this, getString(R.string.status_wallet_connect_failed), Toast.LENGTH_LONG).show();
+                        break;
+                    case ConnectionStatus_WrongVersion:
+                        Toast.makeText(WalletActivity.this, getString(R.string.status_wallet_connect_wrongversion), Toast.LENGTH_LONG).show();
+                        break;
+                    case ConnectionStatus_Connected:
+                        break;
                 }
             }
         });
-        if (!success) {
+        if (connStatus != Wallet.ConnectionStatus.ConnectionStatus_Connected) {
             finish();
         } else {
             haveWallet = true;
@@ -545,6 +560,7 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
                     getSupportFragmentManager().findFragmentById(R.id.fragment_container);
             runOnUiThread(new Runnable() {
                 public void run() {
+                    updateAccountsHeader();
                     if (walletFragment != null) {
                         walletFragment.onLoaded();
                     }
@@ -716,7 +732,7 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
             intent.putExtra(WalletService.REQUEST_CMD_TX_TAG, tag);
             startService(intent);
             Timber.d("CREATE TX request sent");
-            if (getWallet().isKeyOnDevice())
+            if (getWallet().getDeviceType() == Wallet.Device.Device_Ledger)
                 showLedgerProgressDialog(LedgerProgressDialog.TYPE_SEND);
         } else {
             Timber.e("Service not bound");
@@ -953,13 +969,22 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
     }
 
     // drawer stuff
-    void updateAccountsList() {
+
+    void updateAccountsBalance() {
         final Wallet wallet = getWallet();
-        final TextView tvName = (TextView) accountsView.getHeaderView(0).findViewById(R.id.tvName);
-        tvName.setText(wallet.getName());
         final TextView tvBalance = (TextView) accountsView.getHeaderView(0).findViewById(R.id.tvBalance);
         tvBalance.setText(getString(R.string.accounts_balance,
                 Helper.getDisplayAmount(wallet.getBalanceAll(), 5)));
+    }
+
+    void updateAccountsHeader() {
+        final Wallet wallet = getWallet();
+        final TextView tvName = (TextView) accountsView.getHeaderView(0).findViewById(R.id.tvName);
+        tvName.setText(wallet.getName());
+    }
+
+    void updateAccountsList() {
+        final Wallet wallet = getWallet();
         Menu menu = accountsView.getMenu();
         menu.removeGroup(R.id.accounts_list);
         final int n = wallet.getNumAccounts();
@@ -1072,12 +1097,17 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
         @Override
         protected void onPreExecute() {
             super.onPreExecute();
-            if (getWallet().isKeyOnDevice()) {
-                showLedgerProgressDialog(LedgerProgressDialog.TYPE_ACCOUNT);
-                dialogOpened = true;
-            } else {
-                showProgressDialog(R.string.accounts_progress_new);
-                dialogOpened = true;
+            switch (getWallet().getDeviceType()) {
+                case Device_Ledger:
+                    showLedgerProgressDialog(LedgerProgressDialog.TYPE_ACCOUNT);
+                    dialogOpened = true;
+                    break;
+                case Device_Software:
+                    showProgressDialog(R.string.accounts_progress_new);
+                    dialogOpened = true;
+                    break;
+                default:
+                    throw new IllegalStateException("Hardware backing not supported. At all!");
             }
         }
 

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

@@ -162,7 +162,7 @@ public class BarcodeData {
         String noScheme = uri.substring(XMR_SCHEME.length());
         Uri monero = Uri.parse(noScheme);
         Map<String, String> parms = new HashMap<>();
-        String query = monero.getQuery();
+        String query = monero.getEncodedQuery();
         if (query != null) {
             String[] args = query.split("&");
             for (String arg : args) {

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

@@ -39,6 +39,7 @@ import com.m2049r.xmrwallet.R;
 import com.m2049r.xmrwallet.data.BarcodeData;
 import com.m2049r.xmrwallet.data.TxData;
 import com.m2049r.xmrwallet.data.TxDataBtc;
+import com.m2049r.xmrwallet.model.PendingTransaction;
 import com.m2049r.xmrwallet.model.Wallet;
 import com.m2049r.xmrwallet.util.BitcoinAddressValidator;
 import com.m2049r.xmrwallet.util.Helper;
@@ -350,6 +351,8 @@ public class SendAddressWizardFragment extends SendWizardFragment {
                 txData.setPaymentId(etPaymentId.getEditText().getText().toString());
             }
             txData.setUserNotes(new UserNotes(etNotes.getEditText().getText().toString()));
+            txData.setPriority(PendingTransaction.Priority.Priority_Default);
+            txData.setMixin(SendFragment.MIXIN);
         }
         return true;
     }

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

@@ -58,11 +58,12 @@ import timber.log.Timber;
 public class SendFragment extends Fragment
         implements SendAddressWizardFragment.Listener,
         SendAmountWizardFragment.Listener,
-        SendSettingsWizardFragment.Listener,
         SendConfirmWizardFragment.Listener,
         SendSuccessWizardFragment.Listener,
         OnBackPressedListener, OnUriScannedListener {
 
+    final static public int MIXIN = 10;
+
     private Listener activityCallback;
 
     public interface Listener {
@@ -301,10 +302,9 @@ public class SendFragment extends Fragment
     public class SpendPagerAdapter extends FragmentStatePagerAdapter {
         private static final int POS_ADDRESS = 0;
         private static final int POS_AMOUNT = 1;
-        private static final int POS_SETTINGS = 2;
-        private static final int POS_CONFIRM = 3;
-        private static final int POS_SUCCESS = 4;
-        private int numPages = 4;
+        private static final int POS_CONFIRM = 2;
+        private static final int POS_SUCCESS = 3;
+        private int numPages = 3;
 
         SparseArray<WeakReference<SendWizardFragment>> myFragments = new SparseArray<>();
 
@@ -355,8 +355,6 @@ public class SendFragment extends Fragment
                         return SendAddressWizardFragment.newInstance(SendFragment.this);
                     case POS_AMOUNT:
                         return SendAmountWizardFragment.newInstance(SendFragment.this);
-                    case POS_SETTINGS:
-                        return SendSettingsWizardFragment.newInstance(SendFragment.this);
                     case POS_CONFIRM:
                         return SendConfirmWizardFragment.newInstance(SendFragment.this);
                     case POS_SUCCESS:
@@ -370,8 +368,6 @@ public class SendFragment extends Fragment
                         return SendAddressWizardFragment.newInstance(SendFragment.this);
                     case POS_AMOUNT:
                         return SendBtcAmountWizardFragment.newInstance(SendFragment.this);
-                    case POS_SETTINGS:
-                        return SendSettingsWizardFragment.newInstance(SendFragment.this);
                     case POS_CONFIRM:
                         return SendBtcConfirmWizardFragment.newInstance(SendFragment.this);
                     case POS_SUCCESS:
@@ -393,8 +389,6 @@ public class SendFragment extends Fragment
                     return getString(R.string.send_address_title);
                 case POS_AMOUNT:
                     return getString(R.string.send_amount_title);
-                case POS_SETTINGS:
-                    return getString(R.string.send_settings_title);
                 case POS_CONFIRM:
                     return getString(R.string.send_confirm_title);
                 case POS_SUCCESS:
@@ -407,7 +401,8 @@ public class SendFragment extends Fragment
         @Override
         public int getItemPosition(Object object) {
             Timber.d("getItemPosition %s", String.valueOf(object));
-            if ((object instanceof SendAddressWizardFragment) || (object instanceof SendSettingsWizardFragment)) {
+            if (object instanceof SendAddressWizardFragment) {
+                // keep these pages
                 return POSITION_UNCHANGED;
             } else {
                 return POSITION_NONE;

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

@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2017 m2049r
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.m2049r.xmrwallet.fragment.send;
-
-import android.os.Bundle;
-import android.text.InputType;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.inputmethod.EditorInfo;
-import android.widget.EditText;
-import android.widget.Spinner;
-import android.widget.TextView;
-
-import com.m2049r.xmrwallet.R;
-import com.m2049r.xmrwallet.data.TxData;
-import com.m2049r.xmrwallet.model.PendingTransaction;
-import com.m2049r.xmrwallet.util.Helper;
-import com.m2049r.xmrwallet.util.UserNotes;
-
-import timber.log.Timber;
-
-public class SendSettingsWizardFragment extends SendWizardFragment {
-    final static public int MIXIN = 6;
-
-    public static SendSettingsWizardFragment newInstance(Listener listener) {
-        SendSettingsWizardFragment instance = new SendSettingsWizardFragment();
-        instance.setSendListener(listener);
-        return instance;
-    }
-
-    Listener sendListener;
-
-    public SendSettingsWizardFragment setSendListener(Listener listener) {
-        this.sendListener = listener;
-        return this;
-    }
-
-    interface Listener {
-        TxData getTxData();
-    }
-
-    final static PendingTransaction.Priority Priorities[] =
-            {PendingTransaction.Priority.Priority_Default,
-                    PendingTransaction.Priority.Priority_Low,
-                    PendingTransaction.Priority.Priority_Medium,
-                    PendingTransaction.Priority.Priority_High}; // must match the layout XML
-
-    private Spinner sPriority;
-    private EditText etDummy;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-
-        Timber.d("onCreateView() %s", (String.valueOf(savedInstanceState)));
-
-        View view = inflater.inflate(
-                R.layout.fragment_send_settings, container, false);
-
-        sPriority = (Spinner) view.findViewById(R.id.sPriority);
-
-        etDummy = (EditText) view.findViewById(R.id.etDummy);
-        etDummy.setRawInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
-
-        return view;
-    }
-
-    @Override
-    public boolean onValidateFields() {
-        if (sendListener != null) {
-            TxData txData = sendListener.getTxData();
-            txData.setPriority(Priorities[sPriority.getSelectedItemPosition()]);
-            txData.setMixin(MIXIN);
-        }
-        return true;
-    }
-
-    @Override
-    public void onResumeFragment() {
-        super.onResumeFragment();
-        Timber.d("onResumeFragment()");
-        Helper.hideKeyboard(getActivity());
-        etDummy.requestFocus();
-    }
-}

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

@@ -34,11 +34,9 @@ import java.io.IOException;
 import timber.log.Timber;
 
 public class Ledger {
-    // lookahead parameters as suggest on
-    // https://monero.stackexchange.com/a/9902/8977 (Step 8)
-    // by dEBRUYNE
-    static public final int LOOKAHEAD_ACCOUNTS = 3;
-    static public final int LOOKAHEAD_SUBADDRESSES = 100;
+    // 5:20 is same as wallet2.cpp::restore()
+    static public final int LOOKAHEAD_ACCOUNTS = 5;
+    static public final int LOOKAHEAD_SUBADDRESSES = 20;
     static public final String SUBADDRESS_LOOKAHEAD = LOOKAHEAD_ACCOUNTS + ":" + LOOKAHEAD_SUBADDRESSES;
 
     public static final int SW_OK = 0x9000;

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

@@ -60,6 +60,12 @@ public class Wallet {
         this.accountIndex = accountIndex;
     }
 
+    public enum Device {
+        Device_Undefined,
+        Device_Software,
+        Device_Ledger
+    };
+
     public enum Status {
         Status_Ok,
         Status_Error,
@@ -394,5 +400,11 @@ public class Wallet {
         return getSubaddress(accountIndex, getNumSubaddresses(accountIndex) - 1);
     }
 
-    public native boolean isKeyOnDevice();
+    public Wallet.Device getDeviceType() {
+        int device = getDeviceTypeJ();
+        return Wallet.Device.values()[device + 1]; // mapping is monero+1=android
+    }
+
+    private native int getDeviceTypeJ();
+
 }

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

@@ -178,10 +178,15 @@ public class WalletManager {
     public native boolean verifyWalletPassword(String keys_file_name, String password, boolean watch_only);
 
     public boolean verifyWalletPasswordOnly(String keys_file_name, String password) {
-        return queryWalletHardware(keys_file_name, password) >= 0;
+        return queryWalletDeviceJ(keys_file_name, password) >= 0;
     }
 
-    public native int queryWalletHardware(String keys_file_name, String password);
+    public Wallet.Device queryWalletDevice(String keys_file_name, String password) {
+        int device = queryWalletDeviceJ(keys_file_name, password);
+        return Wallet.Device.values()[device + 1]; // mapping is monero+1=android
+    }
+
+    private native int queryWalletDeviceJ(String keys_file_name, String password);
 
     //public native List<String> findWallets(String path); // this does not work - some error in boost
 

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

@@ -226,9 +226,9 @@ public class WalletService extends Service {
 
         void onSetNotes(boolean success);
 
-        void onWalletStarted(boolean success);
+        void onWalletStarted(Wallet.ConnectionStatus walletStatus);
 
-        void onWalletOpen(int hardware);
+        void onWalletOpen(Wallet.Device device);
     }
 
     String progressText = null;
@@ -293,9 +293,9 @@ public class WalletService extends Service {
                         if (walletId != null) {
                             showProgress(getString(R.string.status_wallet_loading));
                             showProgress(10);
-                            boolean success = start(walletId, walletPw);
-                            if (observer != null) observer.onWalletStarted(success);
-                            if (!success) {
+                            Wallet.ConnectionStatus connStatus = start(walletId, walletPw);
+                            if (observer != null) observer.onWalletStarted(connStatus);
+                            if (connStatus != Wallet.ConnectionStatus.ConnectionStatus_Connected) {
                                 errorState = true;
                                 stop();
                             }
@@ -490,7 +490,7 @@ public class WalletService extends Service {
         return true; // true is important so that onUnbind is also called next time
     }
 
-    private boolean start(String walletName, String walletPassword) {
+    private Wallet.ConnectionStatus start(String walletName, String walletPassword) {
         Timber.d("start()");
         startNotfication();
         showProgress(getString(R.string.status_wallet_loading));
@@ -498,9 +498,11 @@ public class WalletService extends Service {
         if (listener == null) {
             Timber.d("start() loadWallet");
             Wallet aWallet = loadWallet(walletName, walletPassword);
-            if ((aWallet == null) || (aWallet.getConnectionStatus() != Wallet.ConnectionStatus.ConnectionStatus_Connected)) {
+            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 false;
+                return connStatus;
             }
             listener = new MyWalletListener();
             listener.start();
@@ -511,7 +513,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 true;
+        return Wallet.ConnectionStatus.ConnectionStatus_Connected;
     }
 
     public void stop() {
@@ -550,8 +552,9 @@ public class WalletService extends Service {
         showProgress(30);
         if (walletMgr.walletExists(path)) {
             Timber.d("open wallet %s", path);
-            int hw = WalletManager.getInstance().queryWalletHardware(path + ".keys", walletPassword);
-            if (observer != null) observer.onWalletOpen(hw);
+            Wallet.Device device = WalletManager.getInstance().queryWalletDevice(path + ".keys", walletPassword);
+            Timber.d("device is %s", device.toString());
+            if (observer != null) observer.onWalletOpen(device);
             wallet = walletMgr.openWallet(path, walletPassword);
             showProgress(60);
             Timber.d("wallet opened");

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

@@ -76,10 +76,14 @@ import okhttp3.HttpUrl;
 import timber.log.Timber;
 
 public class Helper {
+    static private final String FLAVOR_SUFFIX =
+            (BuildConfig.FLAVOR.equals("prod") ? "" : "." + BuildConfig.FLAVOR)
+                    + (BuildConfig.DEBUG ? "-debug" : "");
+
     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" : "");
+    static private final String WALLET_DIR = "monerujo" + FLAVOR_SUFFIX;
+    static private final String HOME_DIR = "monero" + FLAVOR_SUFFIX;
 
     static public int DISPLAY_DIGITS_INFO = 5;
 

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

@@ -53,7 +53,7 @@
             app:activeDot="0"
             app:dotSize="12dp"
             app:inactiveColor="@color/dotGray"
-            app:numberDots="4" />
+            app:numberDots="3" />
 
         <Button
             android:id="@+id/bNext"

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

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <EditText
-        android:id="@+id/etDummy"
-        android:layout_width="0dp"
-        android:layout_height="0dp" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="16sp"
-        android:layout_marginTop="16sp"
-        android:orientation="horizontal">
-
-        <TextView
-            style="@style/MoneroLabel.Caps.Gray.Small"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center|end"
-            android:layout_marginEnd="8dp"
-            android:text="@string/label_send_settings_advanced"
-            android:textAlignment="textEnd" />
-
-        <Spinner
-            android:id="@+id/sPriority"
-            style="@style/MoneroSpinner"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:entries="@array/priority"
-            android:textAlignment="center" />
-
-    </LinearLayout>
-
-    <TextView
-        style="@style/MoneroFab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="start"
-        android:drawablePadding="8dp"
-        android:drawableStart="@drawable/ic_info_outline_gray_24dp"
-        android:gravity="center"
-        android:text="@string/info_send_prio_fees" />
-
-</LinearLayout>

app/src/main/res/values-de/strings.xml

@@ -235,7 +235,6 @@
     <string name="send_available">Verfügbar: %1$s XMR</string>
     <string name="send_address_title">Adresse</string>
     <string name="send_amount_title">Betrag</string>
-    <string name="send_settings_title">Einstellungen</string>
     <string name="send_confirm_title">Bestätigen</string>
     <string name="send_success_title">Fertig</string>
 
@@ -345,13 +344,15 @@
     <string name="send_address_no_dnssec">OpenAlias ohne DNSSEC - Adresse kann gefälscht sein!</string>
     <string name="send_address_hint">Empfänger XMR/BTC Adresse oder OpenAlias</string>
 
-    <string name="progress_nfc_write">Writing Tag</string>
-    <string name="nfc_write_failed">Writing Tag failed!</string>
-    <string name="nfc_write_successful">Writing Tag successful</string>
-    <string name="nfc_tag_unsupported">Tag does not support NDEF!</string>
-    <string name="nfc_tag_size">Tag provides %d bytes, but we need %d!</string>
-    <string name="nfc_tag_read_undef">I don\'t understand the Tag!</string>
-    <string name="nfc_tag_read_what">I don\'t know what you want!</string>
-    <string name="nfc_tag_read_success">Reading Tag successful</string>
-    <string name="nfc_tag_tap">NFC Available!</string>
+    <string name="progress_nfc_write">Schreibe Tag</string>
+    <string name="nfc_write_failed">Schreiben des Tags fehlgeschlagen!</string>
+    <string name="nfc_write_successful">Tag erfolgreich geschrieben</string>
+    <string name="nfc_tag_unsupported">Tag unterstützt NDEF nicht!</string>
+    <string name="nfc_tag_size">Tag bietet %1$d Bytes, aber wir brauchen %2$d!</string>
+    <string name="nfc_tag_read_undef">Ich verstehe den Tag nicht!</string>
+    <string name="nfc_tag_read_what">Ich weiß nicht, was du willst!</string>
+    <string name="nfc_tag_read_success">Tag erfolgreich gelesen</string>
+    <string name="nfc_tag_tap">NFC verfügbar!</string>
+
+    <string name="status_wallet_connect_wrongversion">Node version incompatible - please upgrade!</string>
 </resources>

app/src/main/res/values-el/strings.xml

@@ -209,7 +209,6 @@
     <string name="send_available">Υπόλοιπο: %1$s XMR</string>
     <string name="send_address_title">Διεύθυνση</string>
     <string name="send_amount_title">Ποσό</string>
-    <string name="send_settings_title">Ρυθμίσεις</string>
     <string name="send_confirm_title">Επιβεβαίωση</string>
     <string name="send_success_title">Έγινε</string>
 
@@ -340,7 +339,7 @@
     <string name="nfc_write_failed">Writing Tag failed!</string>
     <string name="nfc_write_successful">Writing Tag successful</string>
     <string name="nfc_tag_unsupported">Tag does not support NDEF!</string>
-    <string name="nfc_tag_size">Tag provides %d bytes, but we need %d!</string>
+    <string name="nfc_tag_size">Tag provides %1$d bytes, but we need %2$d!</string>
     <string name="nfc_tag_read_undef">I don\'t understand the Tag!</string>
     <string name="nfc_tag_read_what">I don\'t know what you want!</string>
     <string name="nfc_tag_read_success">Reading Tag successful</string>
@@ -353,4 +352,6 @@
     <string name="send_address_resolve_openalias">Resolving OpenAlias&#8230;</string>
     <string name="send_address_no_dnssec">OpenAlias without DNSSEC - address may be spoofed</string>
     <string name="send_address_hint">Receiver\'s XMR/BTC Address or OpenAlias</string>
+
+    <string name="status_wallet_connect_wrongversion">Node version incompatible - please upgrade!</string>
 </resources>

app/src/main/res/values-es/strings.xml

@@ -174,7 +174,6 @@
     <string name="send_available">Fondos disponibles: %1$s XMR</string>
     <string name="send_address_title">Dirección</string>
     <string name="send_amount_title">Monto</string>
-    <string name="send_settings_title">Ajustes</string>
     <string name="send_confirm_title">Aprobar</string>
     <string name="send_success_title">Hecho</string>
 
@@ -327,7 +326,7 @@
     <string name="nfc_write_failed">Writing Tag failed!</string>
     <string name="nfc_write_successful">Writing Tag successful</string>
     <string name="nfc_tag_unsupported">Tag does not support NDEF!</string>
-    <string name="nfc_tag_size">Tag provides %d bytes, but we need %d!</string>
+    <string name="nfc_tag_size">Tag provides %1$d bytes, but we need %2$d!</string>
     <string name="nfc_tag_read_undef">I don\'t understand the Tag!</string>
     <string name="nfc_tag_read_what">I don\'t know what you want!</string>
     <string name="nfc_tag_read_success">Reading Tag successful</string>
@@ -340,4 +339,6 @@
     <string name="send_address_resolve_openalias">Resolving OpenAlias&#8230;</string>
     <string name="send_address_no_dnssec">OpenAlias without DNSSEC - address may be spoofed</string>
     <string name="send_address_hint">Receiver\'s XMR/BTC Address or OpenAlias</string>
+
+    <string name="status_wallet_connect_wrongversion">Node version incompatible - please upgrade!</string>
 </resources>