bump version 1.14.6

Various fixes & tweaks

.gitignore

@@ -14,3 +14,4 @@
 /app/prodMainnet
 /app/alphaStagenet
 /app/prodStagenet
+/app/.cxx

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,22 @@ 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)
+
+add_library(hardforks STATIC IMPORTED)
+set_target_properties(hardforks PROPERTIES IMPORTED_LOCATION
+        ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libhardforks.a)
+
+add_library(randomx STATIC IMPORTED)
+set_target_properties(randomx PROPERTIES IMPORTED_LOCATION
+        ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/librandomx.a)
+
+add_library(rpc_base STATIC IMPORTED)
+set_target_properties(rpc_base PROPERTIES IMPORTED_LOCATION
+        ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/librpc_base.a)
+
 #############
 # System
 #############
@@ -166,6 +186,7 @@ target_link_libraries(  monerujo
                         mnemonics
                         ringct
                         ringct_basic
+                        net
                         common
                         cncrypto
                         blockchain_db
@@ -176,8 +197,12 @@ target_link_libraries(  monerujo
                         blocks
                         checkpoints
                         device
+                        device_trezor
                         multisig
                         version
+                        randomx
+                        hardforks
+                        rpc_base
 
                         boost_chrono
                         boost_date_time

app/build.gradle

@@ -2,14 +2,13 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    buildToolsVersion '29.0.2'
     defaultConfig {
         applicationId "com.m2049r.xmrwallet"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 173
+        versionCode 406
-        versionName "1.11.3 'Chernushka'"
+        versionName "1.14.6 'On Board'"
-
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
@@ -93,6 +92,11 @@ android {
                 outputFileName = "$rootProject.ext.apkName-" + v + "_" + abiName + ".apk"
         }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
@@ -102,6 +106,7 @@ dependencies {
     implementation "com.android.support:recyclerview-v7:$rootProject.ext.supportVersion"
     implementation "com.android.support:cardview-v7:$rootProject.ext.supportVersion"
     implementation "com.android.support:swiperefreshlayout:$rootProject.ext.supportVersion"
+    implementation "com.android.support.constraint:constraint-layout:$rootProject.ext.constraintVersion"
     implementation 'me.dm7.barcodescanner:zxing:1.9.8'
 
     implementation "com.squareup.okhttp3:okhttp:$rootProject.ext.okHttpVersion"
@@ -124,5 +129,4 @@ dependencies {
     testImplementation "com.squareup.okhttp3:mockwebserver:$rootProject.ext.okHttpVersion"
     testImplementation 'org.json:json:20180813'
     testImplementation 'net.jodah:concurrentunit:0.4.4'
-
 }

app/src/main/AndroidManifest.xml

@@ -20,24 +20,27 @@
         android:supportsRtl="true"
         android:theme="@style/MyMaterialTheme"
         android:usesCleartextTraffic="true">
-
+        <activity android:name=".MainActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".WalletActivity"
             android:configChanges="orientation|keyboardHidden"
             android:label="@string/wallet_activity_name"
             android:launchMode="singleTask"
             android:screenOrientation="behind" />
-
         <activity
             android:name=".LoginActivity"
             android:configChanges="orientation|keyboardHidden"
             android:label="@string/app_name"
             android:launchMode="singleTop"
             android:screenOrientation="locked">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
             <intent-filter>
                 <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
             </intent-filter>
@@ -62,6 +65,10 @@
                 android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
                 android:resource="@xml/usb_device_filter" />
         </activity>
+        <activity android:name=".onboarding.OnBoardingActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"/>
 
         <service
             android:name=".service.WalletService"
@@ -79,4 +86,4 @@
                 android:resource="@xml/filepaths" />
         </provider>
     </application>
-</manifest>
+</manifest>

app/src/main/cpp/device_io_monerujo.hpp

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

app/src/main/cpp/monerujo.h

@@ -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)) {
+            if (device.getVendorId() == VID) {
-                return device;
+                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

@@ -79,6 +79,23 @@ public class GenerateFragment extends Fragment {
 
     private String type = null;
 
+    private void clearErrorOnTextEntry(final TextInputLayout textInputLayout) {
+        textInputLayout.getEditText().addTextChangedListener(new TextWatcher() {
+            @Override
+            public void afterTextChanged(Editable editable) {
+                textInputLayout.setError(null);
+            }
+
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+            }
+        });
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -110,6 +127,23 @@ public class GenerateFragment extends Fragment {
                 }
             }
         });
+        clearErrorOnTextEntry(etWalletName);
+
+        etWalletPassword.getEditText().addTextChangedListener(new TextWatcher() {
+            @Override
+            public void afterTextChanged(Editable editable) {
+                checkPassword();
+            }
+
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+            }
+        });
+
         etWalletMnemonic.getEditText().setOnFocusChangeListener(new View.OnFocusChangeListener() {
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
@@ -118,6 +152,8 @@ public class GenerateFragment extends Fragment {
                 }
             }
         });
+        clearErrorOnTextEntry(etWalletMnemonic);
+
         etWalletAddress.getEditText().setOnFocusChangeListener(new View.OnFocusChangeListener() {
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
@@ -126,6 +162,8 @@ public class GenerateFragment extends Fragment {
                 }
             }
         });
+        clearErrorOnTextEntry(etWalletAddress);
+
         etWalletViewKey.getEditText().setOnFocusChangeListener(new View.OnFocusChangeListener() {
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
@@ -134,6 +172,8 @@ public class GenerateFragment extends Fragment {
                 }
             }
         });
+        clearErrorOnTextEntry(etWalletViewKey);
+
         etWalletSpendKey.getEditText().setOnFocusChangeListener(new View.OnFocusChangeListener() {
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
@@ -142,6 +182,7 @@ public class GenerateFragment extends Fragment {
                 }
             }
         });
+        clearErrorOnTextEntry(etWalletSpendKey);
 
         Helper.showKeyboard(getActivity());
 
@@ -310,21 +351,6 @@ public class GenerateFragment extends Fragment {
             }
         });
 
-        etWalletPassword.getEditText().addTextChangedListener(new TextWatcher() {
-            @Override
-            public void afterTextChanged(Editable editable) {
-                checkPassword();
-            }
-
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-            }
-        });
-
         etWalletName.requestFocus();
         initZxcvbn();
 
@@ -412,7 +438,7 @@ public class GenerateFragment extends Fragment {
             height = RestoreHeight.getInstance().getHeight(parser.parse(restoreHeight));
         } catch (ParseException ex) {
         }
-        if (height <= 0)
+        if ((height <= 0) && (restoreHeight.length() == 8))
             try {
                 // is it a date without dashes?
                 SimpleDateFormat parser = new SimpleDateFormat("yyyyMMdd");
@@ -682,8 +708,7 @@ public class GenerateFragment extends Fragment {
             }
         });
 
-        // set FLAG_SECURE to prevent screenshots in Release Mode
+        if (Helper.preventScreenshot()) {
-        if (!(BuildConfig.DEBUG && BuildConfig.FLAVOR_type.equals("alpha"))) {
             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();
+            walletStatus = wallet.getStatus();
-            if (status != Wallet.Status.Status_Ok) {
+            if (!walletStatus.isOk()) {
-                Timber.e(wallet.getErrorString());
+                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());
+                tvWalletAddress.setText(walletStatus.toString());
-                tvWalletMnemonic.setText(status.toString());
+                tvWalletHeight.setText(walletStatus.toString());
-                tvWalletViewKey.setText(status.toString());
+                tvWalletMnemonic.setText(walletStatus.toString());
-                tvWalletSpendKey.setText(status.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

@@ -315,10 +315,14 @@ public class LoginActivity extends BaseActivity
                         if (WalletManager.getInstance().walletExists(walletFile)) {
                             Helper.promptPassword(LoginActivity.this, walletName, true, new Helper.PasswordAction() {
                                 @Override
-                                public void action(String walletName, String password, boolean fingerprintUsed) {
+                                public void act(String walletName, String password, boolean fingerprintUsed) {
                                     if (checkDevice(walletName, password))
                                         startDetails(walletFile, password, GenerateReviewFragment.VIEW_TYPE_DETAILS);
                                 }
+
+                                @Override
+                                public void fail(String walletName, String password, boolean fingerprintUsed) {
+                                }
                             });
                         } else { // this cannot really happen as we prefilter choices
                             Timber.e("Wallet missing: %s", walletName);
@@ -348,10 +352,14 @@ public class LoginActivity extends BaseActivity
         if (WalletManager.getInstance().walletExists(walletFile)) {
             Helper.promptPassword(LoginActivity.this, walletName, false, new Helper.PasswordAction() {
                 @Override
-                public void action(String walletName, String password, boolean fingerprintUsed) {
+                public void act(String walletName, String password, boolean fingerprintUsed) {
                     if (checkDevice(walletName, password))
                         startReceive(walletFile, password);
                 }
+
+                @Override
+                public void fail(String walletName, String password, boolean fingerprintUsed) {
+                }
             });
         } else { // this cannot really happen as we prefilter choices
             Toast.makeText(this, getString(R.string.bad_wallet), Toast.LENGTH_SHORT).show();
@@ -918,6 +926,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 +947,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);
+                                .createWallet(aFile, password, MNEMONIC_LANGUAGE, restoreHeight);
-                        boolean success = (newWallet.getStatus() == Wallet.Status.Status_Ok);
+                        return checkAndCloseWallet(newWallet);
-                        if (!success) {
-                            Timber.e(newWallet.getErrorString());
-                            toast(newWallet.getErrorString());
-                        }
-                        newWallet.close();
-                        return success;
                     }
                 });
     }
@@ -956,13 +972,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);
+                        return checkAndCloseWallet(newWallet);
-                        if (!success) {
-                            Timber.e(newWallet.getErrorString());
-                            toast(newWallet.getErrorString());
-                        }
-                        newWallet.close();
-                        return success;
                     }
                 });
     }
@@ -982,13 +992,7 @@ public class LoginActivity extends BaseActivity
                         Wallet newWallet = WalletManager.getInstance()
                                 .createWalletFromDevice(aFile, password,
                                         restoreHeight, "Ledger");
-                        boolean success = (newWallet.getStatus() == Wallet.Status.Status_Ok);
+                        return checkAndCloseWallet(newWallet);
-                        if (!success) {
-                            Timber.e(newWallet.getErrorString());
-                            toast(newWallet.getErrorString());
-                        }
-                        newWallet.close();
-                        return success;
                     }
                 });
     }
@@ -1009,13 +1013,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);
+                        return checkAndCloseWallet(newWallet);
-                        if (!success) {
-                            Timber.e(newWallet.getErrorString());
-                            toast(newWallet.getErrorString());
-                        }
-                        newWallet.close();
-                        return success;
                     }
                 });
     }
@@ -1316,10 +1314,15 @@ public class LoginActivity extends BaseActivity
             Helper.promptPassword(LoginActivity.this, walletName, false,
                     new Helper.PasswordAction() {
                         @Override
-                        public void action(String walletName, String password, boolean fingerprintUsed) {
+                        public void act(String walletName, String password, boolean fingerprintUsed) {
                             if (checkDevice(walletName, password))
                                 startWallet(walletName, password, fingerprintUsed, streetmode);
                         }
+
+                        @Override
+                        public void fail(String walletName, String password, boolean fingerprintUsed) {
+                        }
+
                     });
         } else { // this cannot really happen as we prefilter choices
             Toast.makeText(this, getString(R.string.bad_wallet), Toast.LENGTH_SHORT).show();
@@ -1370,17 +1373,30 @@ public class LoginActivity extends BaseActivity
         if (Ledger.ENABLED)
             try {
                 Ledger.connect(usbManager, usbDevice);
-                registerDetachReceiver();
+                if (!Ledger.check()) {
-                onLedgerAction();
+                    Ledger.disconnect();
-                runOnUiThread(new Runnable() {
+                    runOnUiThread(new Runnable() {
-                    @Override
+                        @Override
-                    public void run() {
+                        public void run() {
-                        Toast.makeText(LoginActivity.this,
+                            Toast.makeText(LoginActivity.this,
-                                getString(R.string.toast_ledger_attached, usbDevice.getProductName()),
+                                    getString(R.string.toast_ledger_start_app, usbDevice.getProductName()),
-                                Toast.LENGTH_SHORT)
+                                    Toast.LENGTH_SHORT)
-                                .show();
+                                    .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())
+            if (bestNode.isValid()) {
-                return nodesToTest.get(0);
+                activityCallback.setNode(bestNode);
-            else
+                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/MainActivity.java

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

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

@@ -266,6 +266,7 @@ public class NodeFragment extends Fragment
                 seedList.add(new NodeInfo(new InetSocketAddress("198.74.231.92", 18080)));
                 seedList.add(new NodeInfo(new InetSocketAddress("195.154.123.123", 18080)));
                 seedList.add(new NodeInfo(new InetSocketAddress("212.83.172.165", 18080)));
+                seedList.add(new NodeInfo(new InetSocketAddress("192.110.160.146", 18080)));
                 d.seedPeers(seedList);
                 d.awaitTermination(NODES_TO_FIND);
             }
@@ -506,8 +507,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 (Helper.preventScreenshot()) {
-        if (!(BuildConfig.DEBUG && BuildConfig.FLAVOR_type.equals("alpha"))) {
             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/WalletFragment.java

@@ -50,9 +50,8 @@ import com.m2049r.xmrwallet.widget.Toolbar;
 
 import java.text.NumberFormat;
 import java.util.ArrayList;
-import java.util.Date;
+import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import timber.log.Timber;
 
@@ -114,9 +113,12 @@ public class WalletFragment extends Fragment
         ivSynced = view.findViewById(R.id.ivSynced);
 
         sCurrency = view.findViewById(R.id.sCurrency);
-        ArrayAdapter currencyAdapter = ArrayAdapter.createFromResource(getContext(), R.array.currency, R.layout.item_spinner_balance);
+        List<String> currencies = new ArrayList<>();
-        currencyAdapter.setDropDownViewResource(R.layout.item_spinner_dropdown_item);
+        currencies.add(Helper.BASE_CRYPTO);
-        sCurrency.setAdapter(currencyAdapter);
+        currencies.addAll(Arrays.asList(getResources().getStringArray(R.array.currency)));
+        ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<>(getContext(), R.layout.item_spinner_balance, currencies);
+        spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        sCurrency.setAdapter(spinnerAdapter);
 
         bSend = view.findViewById(R.id.bSend);
         bReceive = view.findViewById(R.id.bReceive);
@@ -219,8 +221,8 @@ 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
+        if (!Helper.BASE_CRYPTO.equals(balanceCurrency)) { // not XMR
             double amountB = amountA * balanceRate;
             displayB = Helper.getFormattedAmount(amountB, false);
         } else { // XMR
@@ -229,23 +231,23 @@ public class WalletFragment extends Fragment
         showBalance(displayB);
     }
 
-    String balanceCurrency = Helper.CRYPTO;
+    String balanceCurrency = Helper.BASE_CRYPTO;
     double balanceRate = 1.0;
 
     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();
             Timber.d(currency);
             if (!currency.equals(balanceCurrency) || (balanceRate <= 0)) {
                 showExchanging();
-                exchangeApi.queryExchangeRate(Helper.CRYPTO, currency,
+                exchangeApi.queryExchangeRate(Helper.BASE_CRYPTO, currency,
                         new ExchangeCallback() {
                             @Override
                             public void onSuccess(final ExchangeRate exchangeRate) {
@@ -294,17 +296,17 @@ 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();
     }
 
     public void exchange(final ExchangeRate exchangeRate) {
         hideExchanging();
-        if (!Helper.CRYPTO.equals(exchangeRate.getBaseCurrency())) {
+        if (!Helper.BASE_CRYPTO.equals(exchangeRate.getBaseCurrency())) {
             Timber.e("Not XMR");
             sCurrency.setSelection(0, true);
-            balanceCurrency = Helper.CRYPTO;
+            balanceCurrency = Helper.BASE_CRYPTO;
             balanceRate = 1.0;
         } else {
             int spinnerPosition = ((ArrayAdapter) sCurrency.getAdapter()).getPosition(exchangeRate.getQuoteCurrency());
@@ -354,6 +356,15 @@ public class WalletFragment extends Fragment
         if (isVisible()) enableAccountsList(true); //otherwise it is enabled in onResume()
     }
 
+    public void unsync() {
+        if (!activityCallback.isWatchOnly()) {
+            bSend.setVisibility(View.INVISIBLE);
+            bSend.setEnabled(false);
+        }
+        if (isVisible()) enableAccountsList(false); //otherwise it is enabled in onResume()
+        firstBlock = 0;
+    }
+
     boolean walletLoaded = false;
 
     public void onLoaded() {

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

@@ -59,42 +59,36 @@ public class BarcodeData {
     final public Asset asset;
     final public String address;
     final public String addressName;
-    final public String paymentId;
     final public String amount;
     final public String description;
     final public Security security;
     final public String bip70;
 
     public BarcodeData(Asset asset, String address) {
-        this(asset, address, null, null, null, null, Security.NORMAL);
+        this(asset, address, null, null, null, Security.NORMAL);
     }
 
     public BarcodeData(Asset asset, String address, String amount) {
-        this(asset, address, null, null, null, amount, Security.NORMAL);
+        this(asset, address, null, null, amount, Security.NORMAL);
     }
 
     public BarcodeData(Asset asset, String address, String amount, String description, Security security) {
-        this(asset, address, null, null, description, amount, security);
+        this(asset, address, null, description, amount, security);
-    }
-
-    public BarcodeData(Asset asset, String address, String paymentId, String amount) {
-        this(asset, address, null, paymentId, null, amount, Security.NORMAL);
     }
 
     public BarcodeData(Asset asset, String address, String paymentId, String description, String amount) {
-        this(asset, address, null, paymentId, description, amount, Security.NORMAL);
+        this(asset, address, null, description, amount, Security.NORMAL);
     }
 
-    public BarcodeData(Asset asset, String address, String addressName, String paymentId, String description, String amount, Security security) {
+    public BarcodeData(Asset asset, String address, String addressName, String description, String amount, Security security) {
-        this(asset, address, addressName, null, paymentId, description, amount, security);
+        this(asset, address, addressName, null, description, amount, security);
     }
 
-    public BarcodeData(Asset asset, String address, String addressName, String bip70, String paymentId, String description, String amount, Security security) {
+    public BarcodeData(Asset asset, String address, String addressName, String bip70, String description, String amount, Security security) {
         this.asset = asset;
         this.address = address;
         this.bip70 = bip70;
         this.addressName = addressName;
-        this.paymentId = paymentId;
         this.description = description;
         this.amount = amount;
         this.security = security;
@@ -110,11 +104,6 @@ public class BarcodeData {
         StringBuilder sb = new StringBuilder();
         sb.append(BarcodeData.XMR_SCHEME).append(address);
         boolean first = true;
-        if ((paymentId != null) && !paymentId.isEmpty()) {
-            sb.append("?");
-            first = false;
-            sb.append(BarcodeData.XMR_PAYMENTID).append('=').append(paymentId);
-        }
         if ((description != null) && !description.isEmpty()) {
             sb.append(first ? "?" : "&");
             first = false;
@@ -185,8 +174,11 @@ public class BarcodeData {
         String address = monero.getPath();
 
         String paymentId = parms.get(XMR_PAYMENTID);
-        // deal with empty payment_id created by non-spec-conforming apps
+        // no support for payment ids!
-        if ((paymentId != null) && paymentId.isEmpty()) paymentId = null;
+        if (paymentId != null) {
+            Timber.e("no support for payment ids!");
+            return null;
+        }
 
         String description = parms.get(XMR_DESCRIPTION);
         String amount = parms.get(XMR_AMOUNT);
@@ -198,10 +190,6 @@ public class BarcodeData {
                 return null; // we have an amount but its not a number!
             }
         }
-        if ((paymentId != null) && !Wallet.isPaymentIdValid(paymentId)) {
-            Timber.d("paymentId invalid");
-            return null;
-        }
 
         if (!Wallet.isAddressValid(address)) {
             Timber.d("address invalid");
@@ -267,7 +255,7 @@ public class BarcodeData {
                 Timber.d("[%s] is not http url", bip70);
                 return null;
             }
-            return new BarcodeData(BarcodeData.Asset.BTC, null, null, bip70, null, description, null, Security.NORMAL);
+            return new BarcodeData(BarcodeData.Asset.BTC, null, null, bip70, description, null, Security.NORMAL);
         }
         if (!BitcoinAddressValidator.validate(address)) {
             Timber.d("BTC address (%s) invalid", address);

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,11 +229,16 @@ 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());
-                        final JSONObject header = json.getJSONObject(
+                        String rpcVersion = json.getString("jsonrpc");
-                                "result").getJSONObject("block_header");
+                        if (!RPC_VERSION.equals(rpcVersion))
+                            return false;
+                        final JSONObject result = json.getJSONObject("result");
+                        if (!result.has("credits")) // introduced in monero v0.15.0
+                            return false;
+                        final JSONObject header = result.getJSONObject("block_header");
                         height = header.getLong("height");
                         timestamp = header.getLong("timestamp");
                         majorVersion = header.getInt("major_version");

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

@@ -29,19 +29,16 @@ public class TxData implements Parcelable {
 
     public TxData(TxData txData) {
         this.dstAddr = txData.dstAddr;
-        this.paymentId = txData.paymentId;
         this.amount = txData.amount;
         this.mixin = txData.mixin;
         this.priority = txData.priority;
     }
 
     public TxData(String dstAddr,
-                  String paymentId,
                   long amount,
                   int mixin,
                   PendingTransaction.Priority priority) {
         this.dstAddr = dstAddr;
-        this.paymentId = paymentId;
         this.amount = amount;
         this.mixin = mixin;
         this.priority = priority;
@@ -51,10 +48,6 @@ public class TxData implements Parcelable {
         return dstAddr;
     }
 
-    public String getPaymentId() {
-        return paymentId;
-    }
-
     public long getAmount() {
         return amount;
     }
@@ -71,10 +64,6 @@ public class TxData implements Parcelable {
         this.dstAddr = dstAddr;
     }
 
-    public void setPaymentId(String paymentId) {
-        this.paymentId = paymentId;
-    }
-
     public void setAmount(long amount) {
         this.amount = amount;
     }
@@ -96,7 +85,6 @@ public class TxData implements Parcelable {
     }
 
     private String dstAddr;
-    private String paymentId;
     private long amount;
     private int mixin;
     private PendingTransaction.Priority priority;
@@ -106,7 +94,6 @@ public class TxData implements Parcelable {
     @Override
     public void writeToParcel(Parcel out, int flags) {
         out.writeString(dstAddr);
-        out.writeString(paymentId);
         out.writeLong(amount);
         out.writeInt(mixin);
         out.writeInt(priority.getValue());
@@ -125,7 +112,6 @@ public class TxData implements Parcelable {
 
     protected TxData(Parcel in) {
         dstAddr = in.readString();
-        paymentId = in.readString();
         amount = in.readLong();
         mixin = in.readInt();
         priority = PendingTransaction.Priority.fromInteger(in.readInt());
@@ -142,14 +128,12 @@ public class TxData implements Parcelable {
         StringBuffer sb = new StringBuffer();
         sb.append("dstAddr:");
         sb.append(dstAddr);
-        sb.append(",paymentId:");
-        sb.append(paymentId);
         sb.append(",amount:");
         sb.append(amount);
         sb.append(",mixin:");
         sb.append(mixin);
         sb.append(",priority:");
-        sb.append(String.valueOf(priority));
+        sb.append(priority);
         return sb.toString();
     }
 }

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 (Helper.preventScreenshot()) {
-        if (!(BuildConfig.DEBUG && BuildConfig.FLAVOR_type.equals("alpha"))) {
             getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
         }
     }

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

@@ -31,9 +31,10 @@ import android.view.LayoutInflater;
 import android.view.View;
 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;
@@ -84,14 +85,12 @@ public class SendAddressWizardFragment extends SendWizardFragment {
 
     private EditText etDummy;
     private TextInputLayout etAddress;
-    private TextInputLayout etPaymentId;
     private TextInputLayout etNotes;
-    private Button bPaymentId;
     private CardView cvScan;
     private View tvPaymentIdIntegrated;
-    private View llPaymentId;
     private TextView tvXmrTo;
     private View llXmrTo;
+    private ImageButton bPasteAddress;
 
     private boolean resolvingOA = false;
     private boolean resolvingPP = false;
@@ -111,7 +110,6 @@ public class SendAddressWizardFragment extends SendWizardFragment {
         View view = inflater.inflate(R.layout.fragment_send_address, container, false);
 
         tvPaymentIdIntegrated = view.findViewById(R.id.tvPaymentIdIntegrated);
-        llPaymentId = view.findViewById(R.id.llPaymentId);
         llXmrTo = view.findViewById(R.id.llXmrTo);
         tvXmrTo = view.findViewById(R.id.tvXmrTo);
         tvXmrTo.setText(Html.fromHtml(getString(R.string.info_xmrto)));
@@ -137,28 +135,12 @@ public class SendAddressWizardFragment extends SendWizardFragment {
                         next = null;
                     } else {
                         // maybe a bip72 or 70 URI
-                        String bip70 = PaymentProtocolHelper.getBip70(enteredAddress);
+                        final String bip70 = PaymentProtocolHelper.getBip70(enteredAddress);
                         if (bip70 != null) {
                             // looks good - resolve through xmr.to
                             processBip70(bip70);
-                            next = null;
-                        } else if (checkAddress()) {
-                            if (llPaymentId.getVisibility() == View.VISIBLE) {
-                                next = etPaymentId;
-                            } else {
-                                next = etNotes;
-                            }
                         }
                     }
-                    if (next != null) {
-                        final View focus = next;
-                        etAddress.post(new Runnable() {
-                            @Override
-                            public void run() {
-                                focus.requestFocus();
-                            }
-                        });
-                    }
                 }
             }
         });
@@ -171,8 +153,7 @@ public class SendAddressWizardFragment extends SendWizardFragment {
                 etAddress.setError(null);
                 if (isIntegratedAddress()) {
                     Timber.d("isIntegratedAddress");
-                    etPaymentId.getEditText().getText().clear();
+                    etAddress.setError(getString(R.string.info_paymentid_integrated));
-                    llPaymentId.setVisibility(View.INVISIBLE);
                     tvPaymentIdIntegrated.setVisibility(View.VISIBLE);
                     llXmrTo.setVisibility(View.INVISIBLE);
                     sendListener.setMode(SendFragment.Mode.XMR);
@@ -181,7 +162,6 @@ public class SendAddressWizardFragment extends SendWizardFragment {
                     setBtcMode();
                 } else {
                     Timber.d("isStandardAddress or other");
-                    llPaymentId.setVisibility(View.VISIBLE);
                     tvPaymentIdIntegrated.setVisibility(View.INVISIBLE);
                     llXmrTo.setVisibility(View.INVISIBLE);
                     sendListener.setMode(SendFragment.Mode.XMR);
@@ -197,40 +177,29 @@ public class SendAddressWizardFragment extends SendWizardFragment {
             }
         });
 
-        etPaymentId = view.findViewById(R.id.etPaymentId);
+        bPasteAddress = view.findViewById(R.id.bPasteAddress);
-        etPaymentId.getEditText().setRawInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
+        bPasteAddress.setOnClickListener(new View.OnClickListener() {
-        etPaymentId.getEditText().setOnEditorActionListener(new TextView.OnEditorActionListener() {
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER) && (event.getAction() == KeyEvent.ACTION_DOWN))
-                        || (actionId == EditorInfo.IME_ACTION_NEXT)) {
-                    if (checkPaymentId()) {
-                        etNotes.requestFocus();
-                    }
-                    return true;
-                }
-                return false;
-            }
-        });
-        etPaymentId.getEditText().addTextChangedListener(new TextWatcher() {
-            @Override
-            public void afterTextChanged(Editable editable) {
-                etPaymentId.setError(null);
-            }
-
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-            }
-        });
-
-        bPaymentId = view.findViewById(R.id.bPaymentId);
-        bPaymentId.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                etPaymentId.getEditText().setText((Wallet.generatePaymentId()));
+                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)) {
+                    final EditText et = etAddress.getEditText();
+                    et.setText(address);
+                    et.setSelection(et.getText().length());
+                    etAddress.requestFocus();
+                } else {
+                    final String bip70 = PaymentProtocolHelper.getBip70(clip);
+                    if (bip70 != null) {
+                        final EditText et = etAddress.getEditText();
+                        et.setText(clip);
+                        et.setSelection(et.getText().length());
+                        processBip70(bip70);
+                    } else
+                        Toast.makeText(getActivity(), getString(R.string.send_address_invalid), Toast.LENGTH_SHORT).show();
+                }
             }
         });
 
@@ -241,7 +210,6 @@ public class SendAddressWizardFragment extends SendWizardFragment {
                 if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER) && (event.getAction() == KeyEvent.ACTION_DOWN))
                         || (actionId == EditorInfo.IME_ACTION_DONE)) {
                     etDummy.requestFocus();
-                    Helper.hideKeyboard(getActivity());
                     return true;
                 }
                 return false;
@@ -259,7 +227,6 @@ public class SendAddressWizardFragment extends SendWizardFragment {
         etDummy = view.findViewById(R.id.etDummy);
         etDummy.setRawInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
         etDummy.requestFocus();
-        Helper.hideKeyboard(getActivity());
 
         View tvNfc = view.findViewById(R.id.tvNfc);
         NfcManager manager = (NfcManager) getContext().getSystemService(Context.NFC_SERVICE);
@@ -271,8 +238,6 @@ public class SendAddressWizardFragment extends SendWizardFragment {
 
     private void setBtcMode() {
         Timber.d("setBtcMode");
-        etPaymentId.getEditText().getText().clear();
-        llPaymentId.setVisibility(View.INVISIBLE);
         tvPaymentIdIntegrated.setVisibility(View.INVISIBLE);
         llXmrTo.setVisibility(View.VISIBLE);
         sendListener.setMode(SendFragment.Mode.BTC);
@@ -327,7 +292,7 @@ public class SendAddressWizardFragment extends SendWizardFragment {
 
                 final BarcodeData barcodeData =
                         new BarcodeData(BarcodeData.Asset.BTC, address, null,
-                                resolvedBip70, null, null, String.valueOf(amount),
+                                resolvedBip70, null, String.valueOf(amount),
                                 BarcodeData.Security.BIP70);
                 etNotes.post(new Runnable() {
                     @Override
@@ -388,22 +353,6 @@ public class SendAddressWizardFragment extends SendWizardFragment {
         return BitcoinAddressValidator.validate(address);
     }
 
-    private boolean checkPaymentId() {
-        String paymentId = etPaymentId.getEditText().getText().toString();
-        boolean ok = paymentId.isEmpty() || Wallet.isPaymentIdValid(paymentId);
-        if (!ok) {
-            etPaymentId.setError(getString(R.string.receive_paymentid_invalid));
-        } else {
-            if (!paymentId.isEmpty() && isIntegratedAddress()) {
-                ok = false;
-                etPaymentId.setError(getString(R.string.receive_integrated_paymentid_invalid));
-            } else {
-                etPaymentId.setError(null);
-            }
-        }
-        return ok;
-    }
-
     private void shakeAddress() {
         etAddress.startAnimation(Helper.getShakeAnimation(getContext()));
     }
@@ -426,11 +375,6 @@ public class SendAddressWizardFragment extends SendWizardFragment {
             return false;
         }
 
-        if (!checkPaymentId()) {
-            etPaymentId.startAnimation(Helper.getShakeAnimation(getContext()));
-            return false;
-        }
-
         if (sendListener != null) {
             TxData txData = sendListener.getTxData();
             if (txData instanceof TxDataBtc) {
@@ -444,10 +388,8 @@ public class SendAddressWizardFragment extends SendWizardFragment {
                     ((TxDataBtc) txData).setBip70(null);
                 }
                 txData.setDestinationAddress(null);
-                txData.setPaymentId("");
             } else {
                 txData.setDestinationAddress(etAddress.getEditText().getText().toString());
-                txData.setPaymentId(etPaymentId.getEditText().getText().toString());
             }
             txData.setUserNotes(new UserNotes(etNotes.getEditText().getText().toString()));
             txData.setPriority(PendingTransaction.Priority.Priority_Default);
@@ -510,14 +452,6 @@ public class SendAddressWizardFragment extends SendWizardFragment {
                 etAddress.setError(null);
             }
 
-            String scannedPaymentId = barcodeData.paymentId;
-            if (scannedPaymentId != null) {
-                etPaymentId.getEditText().setText(scannedPaymentId);
-                checkPaymentId();
-            } else {
-                etPaymentId.getEditText().getText().clear();
-                etPaymentId.setError(null);
-            }
             String scannedNotes = barcodeData.description;
             if (scannedNotes != null) {
                 etNotes.getEditText().setText(scannedNotes);
@@ -533,7 +467,6 @@ public class SendAddressWizardFragment extends SendWizardFragment {
     public void onResumeFragment() {
         super.onResumeFragment();
         Timber.d("onResumeFragment()");
-        Helper.hideKeyboard(getActivity());
         etDummy.requestFocus();
     }
 

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

@@ -21,8 +21,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.m2049r.xmrwallet.R;
@@ -30,8 +28,7 @@ import com.m2049r.xmrwallet.data.BarcodeData;
 import com.m2049r.xmrwallet.data.TxData;
 import com.m2049r.xmrwallet.model.Wallet;
 import com.m2049r.xmrwallet.util.Helper;
-import com.m2049r.xmrwallet.widget.ExchangeTextView;
+import com.m2049r.xmrwallet.widget.ExchangeEditText;
-import com.m2049r.xmrwallet.widget.NumberPadView;
 
 import timber.log.Timber;
 
@@ -59,8 +56,7 @@ public class SendAmountWizardFragment extends SendWizardFragment {
     }
 
     private TextView tvFunds;
-    private ExchangeTextView evAmount;
+    private ExchangeEditText etAmount;
-    private View llAmount;
     private View rlSweep;
     private ImageButton ibSweep;
 
@@ -75,12 +71,9 @@ public class SendAmountWizardFragment extends SendWizardFragment {
         View view = inflater.inflate(R.layout.fragment_send_amount, container, false);
 
         tvFunds = view.findViewById(R.id.tvFunds);
-
+        etAmount = view.findViewById(R.id.etAmount);
-        evAmount = view.findViewById(R.id.evAmount);
-        ((NumberPadView) view.findViewById(R.id.numberPad)).setListener(evAmount);
-
         rlSweep = view.findViewById(R.id.rlSweep);
-        llAmount = view.findViewById(R.id.llAmount);
+
         view.findViewById(R.id.ivSweep).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -97,8 +90,7 @@ public class SendAmountWizardFragment extends SendWizardFragment {
             }
         });
 
-        Helper.hideKeyboard(getActivity());
+        etAmount.requestFocus();
-
         return view;
     }
 
@@ -107,11 +99,11 @@ public class SendAmountWizardFragment extends SendWizardFragment {
     private void sweepAll(boolean spendAllMode) {
         if (spendAllMode) {
             ibSweep.setVisibility(View.INVISIBLE);
-            llAmount.setVisibility(View.GONE);
+            etAmount.setVisibility(View.GONE);
             rlSweep.setVisibility(View.VISIBLE);
         } else {
             ibSweep.setVisibility(View.VISIBLE);
-            llAmount.setVisibility(View.VISIBLE);
+            etAmount.setVisibility(View.VISIBLE);
             rlSweep.setVisibility(View.GONE);
         }
         this.spendAllMode = spendAllMode;
@@ -124,12 +116,12 @@ public class SendAmountWizardFragment extends SendWizardFragment {
                 sendListener.getTxData().setAmount(Wallet.SWEEP_ALL);
             }
         } else {
-            if (!evAmount.validate(maxFunds)) {
+            if (!etAmount.validate(maxFunds, 0)) {
                 return false;
             }
 
             if (sendListener != null) {
-                String xmr = evAmount.getAmount();
+                String xmr = etAmount.getNativeAmount();
                 if (xmr != null) {
                     sendListener.getTxData().setAmount(Wallet.getAmountFromString(xmr));
                 } else {
@@ -146,7 +138,7 @@ public class SendAmountWizardFragment extends SendWizardFragment {
     public void onResumeFragment() {
         super.onResumeFragment();
         Timber.d("onResumeFragment()");
-        Helper.hideKeyboard(getActivity());
+        Helper.showKeyboard(getActivity());
         final long funds = getTotalFunds();
         maxFunds = 1.0 * funds / 1000000000000L;
         if (!sendListener.getActivityCallback().isStreetMode()) {
@@ -156,11 +148,11 @@ public class SendAmountWizardFragment extends SendWizardFragment {
             tvFunds.setText(getString(R.string.send_available,
                     getString(R.string.unknown_amount)));
         }
-        // getAmount is null if exchange is in progress
+        // getNativeAmount is null if exchange is in progress
-        if ((evAmount.getAmount() != null) && evAmount.getAmount().isEmpty()) {
+        if ((etAmount.getNativeAmount() != null) && etAmount.getNativeAmount().isEmpty()) {
             final BarcodeData data = sendListener.popBarcodeData();
             if ((data != null) && (data.amount != null)) {
-                evAmount.setAmount(data.amount);
+                etAmount.setAmount(data.amount);
             }
         }
     }

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

@@ -31,8 +31,8 @@ import com.m2049r.xmrwallet.data.TxDataBtc;
 import com.m2049r.xmrwallet.model.Wallet;
 import com.m2049r.xmrwallet.util.Helper;
 import com.m2049r.xmrwallet.util.OkHttpHelper;
-import com.m2049r.xmrwallet.widget.ExchangeBtcTextView;
+import com.m2049r.xmrwallet.widget.ExchangeEditText;
-import com.m2049r.xmrwallet.widget.NumberPadView;
+import com.m2049r.xmrwallet.widget.ExchangeOtherEditText;
 import com.m2049r.xmrwallet.widget.SendProgressView;
 import com.m2049r.xmrwallet.xmrto.XmrToError;
 import com.m2049r.xmrwallet.xmrto.XmrToException;
@@ -62,8 +62,7 @@ public class SendBtcAmountWizardFragment extends SendWizardFragment {
     }
 
     private TextView tvFunds;
-    private ExchangeBtcTextView evAmount;
+    private ExchangeOtherEditText etAmount;
-    private NumberPadView numberPad;
 
     private TextView tvXmrToParms;
     private SendProgressView evParams;
@@ -86,24 +85,20 @@ public class SendBtcAmountWizardFragment extends SendWizardFragment {
 
         tvXmrToParms = view.findViewById(R.id.tvXmrToParms);
 
-        evAmount = view.findViewById(R.id.evAmount);
+        etAmount = view.findViewById(R.id.etAmount);
-        numberPad = view.findViewById(R.id.numberPad);
+        etAmount.requestFocus();
-        numberPad.setListener(evAmount);
-
-        Helper.hideKeyboard(getActivity());
-
         return view;
     }
 
 
     @Override
     public boolean onValidateFields() {
-        if (!evAmount.validate(maxBtc, minBtc)) {
+        if (!etAmount.validate(maxBtc, minBtc)) {
             return false;
         }
         if (sendListener != null) {
             TxDataBtc txDataBtc = (TxDataBtc) sendListener.getTxData();
-            String btcString = evAmount.getAmount();
+            String btcString = etAmount.getNativeAmount();
             if (btcString != null) {
                 try {
                     double btc = Double.parseDouble(btcString);
@@ -122,10 +117,12 @@ public class SendBtcAmountWizardFragment extends SendWizardFragment {
 
     private void setBip70Mode() {
         TxDataBtc txDataBtc = (TxDataBtc) sendListener.getTxData();
-        if (txDataBtc.getBip70() != null) {
+        if (txDataBtc.getBip70() == null) {
-            numberPad.setVisibility(View.INVISIBLE);
+            etAmount.setEditable(true);
+            Helper.showKeyboard(getActivity());
         } else {
-            numberPad.setVisibility(View.VISIBLE);
+            etAmount.setEditable(false);
+            Helper.hideKeyboard(getActivity());
         }
     }
 
@@ -141,7 +138,6 @@ public class SendBtcAmountWizardFragment extends SendWizardFragment {
     public void onResumeFragment() {
         super.onResumeFragment();
         Timber.d("onResumeFragment()");
-        Helper.hideKeyboard(getActivity());
         final long funds = getTotalFunds();
         if (!sendListener.getActivityCallback().isStreetMode()) {
             tvFunds.setText(getString(R.string.send_available,
@@ -153,7 +149,7 @@ public class SendBtcAmountWizardFragment extends SendWizardFragment {
         final BarcodeData data = sendListener.popBarcodeData();
         if (data != null) {
             if (data.amount != null) {
-                evAmount.setAmount(data.amount);
+                etAmount.setAmount(data.amount);
             }
         }
         setBip70Mode();
@@ -171,7 +167,7 @@ public class SendBtcAmountWizardFragment extends SendWizardFragment {
         getView().post(new Runnable() {
             @Override
             public void run() {
-                evAmount.setRate(1.0d / orderParameters.getPrice());
+                etAmount.setExchangeRate(1.0d / orderParameters.getPrice());
                 NumberFormat df = NumberFormat.getInstance(Locale.US);
                 df.setMaximumFractionDigits(6);
                 String min = df.format(orderParameters.getLowerLimit());
@@ -211,7 +207,7 @@ public class SendBtcAmountWizardFragment extends SendWizardFragment {
     }
 
     private void processOrderParmsError(final Exception ex) {
-        evAmount.setRate(0);
+        etAmount.setExchangeRate(0);
         orderParameters = null;
         maxBtc = 0;
         minBtc = 0;

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

@@ -346,103 +346,16 @@ public class SendBtcConfirmWizardFragment extends SendWizardFragment implements
     }
 
     public void preSend() {
-        final Activity activity = getActivity();
+        Helper.promptPassword(getContext(), getActivityCallback().getWalletName(), false, new Helper.PasswordAction() {
-        View promptsView = getLayoutInflater().inflate(R.layout.prompt_password, null);
-        android.app.AlertDialog.Builder alertDialogBuilder = new android.app.AlertDialog.Builder(activity);
-        alertDialogBuilder.setView(promptsView);
-
-        final TextInputLayout etPassword = promptsView.findViewById(R.id.etPassword);
-        etPassword.setHint(getString(R.string.prompt_send_password));
-
-        etPassword.getEditText().addTextChangedListener(new TextWatcher() {
             @Override
-            public void afterTextChanged(Editable s) {
+            public void act(String walletName, String password, boolean fingerprintUsed) {
-                if (etPassword.getError() != null) {
+                send();
-                    etPassword.setError(null);
-                }
             }
 
-            @Override
+            public void fail(String walletName, String password, boolean fingerprintUsed) {
-            public void beforeTextChanged(CharSequence s, int start,
+                bSend.setEnabled(sendCountdown > 0); // allow to try again
-                                          int count, int after) {
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start,
-                                      int before, int count) {
             }
         });
-
-        alertDialogBuilder
-                .setCancelable(false)
-                .setPositiveButton(getString(R.string.label_ok), new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int id) {
-                        String pass = etPassword.getEditText().getText().toString();
-                        if (getActivityCallback().verifyWalletPassword(pass)) {
-                            dialog.dismiss();
-                            Helper.hideKeyboardAlways(activity);
-                            send();
-                        } else {
-                            etPassword.setError(getString(R.string.bad_password));
-                        }
-                    }
-                })
-                .setNegativeButton(getString(R.string.label_cancel),
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int id) {
-                                Helper.hideKeyboardAlways(activity);
-                                dialog.cancel();
-                                bSend.setEnabled(sendCountdown > 0); // allow to try again
-                            }
-                        });
-
-        final android.app.AlertDialog passwordDialog = alertDialogBuilder.create();
-        passwordDialog.setOnShowListener(new DialogInterface.OnShowListener() {
-            @Override
-            public void onShow(DialogInterface dialog) {
-                Button button = ((android.app.AlertDialog) dialog).getButton(android.app.AlertDialog.BUTTON_POSITIVE);
-                button.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        String pass = etPassword.getEditText().getText().toString();
-                        if (getActivityCallback().verifyWalletPassword(pass)) {
-                            Helper.hideKeyboardAlways(activity);
-                            passwordDialog.dismiss();
-                            send();
-                        } else {
-                            etPassword.setError(getString(R.string.bad_password));
-                        }
-                    }
-                });
-            }
-        });
-
-        Helper.showKeyboard(passwordDialog);
-
-        // accept keyboard "ok"
-        etPassword.getEditText().setOnEditorActionListener(new TextView.OnEditorActionListener() {
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER) && (event.getAction() == KeyEvent.ACTION_DOWN))
-                        || (actionId == EditorInfo.IME_ACTION_DONE)) {
-                    String pass = etPassword.getEditText().getText().toString();
-                    if (getActivityCallback().verifyWalletPassword(pass)) {
-                        Helper.hideKeyboardAlways(activity);
-                        passwordDialog.dismiss();
-                        send();
-                    } else {
-                        etPassword.setError(getString(R.string.bad_password));
-                    }
-                    return true;
-                }
-                return false;
-            }
-        });
-        // set FLAG_SECURE to prevent screenshots in Release Mode
-        if (!(BuildConfig.DEBUG && BuildConfig.FLAVOR_type.equals("alpha"))) {
-            passwordDialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
-        }
-
-        passwordDialog.show();
     }
 
     // creates a pending transaction and calls us back with transactionCreated()
@@ -457,9 +370,8 @@ public class SendBtcConfirmWizardFragment extends SendWizardFragment implements
         }
         showProgress(3, getString(R.string.label_send_progress_create_tx));
         TxData txData = sendListener.getTxData();
-        txData.setDestinationAddress(xmrtoStatus.getXmrReceivingAddress());
+        txData.setDestinationAddress(xmrtoStatus.getReceivingSubaddress());
-        txData.setPaymentId(xmrtoStatus.getXmrRequiredPaymentIdShort());
+        txData.setAmount(Wallet.getAmountFromDouble(xmrtoStatus.getIncomingAmountTotal()));
-        txData.setAmount(Wallet.getAmountFromDouble(xmrtoStatus.getXmrAmountTotal()));
         getActivityCallback().onPrepareSend(xmrtoStatus.getUuid(), txData);
     }
 
@@ -573,22 +485,22 @@ public class SendBtcConfirmWizardFragment extends SendWizardFragment implements
                     NumberFormat df = NumberFormat.getInstance(Locale.US);
                     df.setMaximumFractionDigits(12);
                     String btcAmount = df.format(status.getBtcAmount());
-                    String xmrAmountTotal = df.format(status.getXmrAmountTotal());
+                    String xmrAmountTotal = df.format(status.getIncomingAmountTotal());
                     tvTxBtcAmount.setText(getString(R.string.text_send_btc_amount, btcAmount, xmrAmountTotal));
-                    String xmrPriceBtc = df.format(status.getXmrPriceBtc());
+                    String xmrPriceBtc = df.format(status.getIncomingPriceBtc());
                     tvTxBtcRate.setText(getString(R.string.text_send_btc_rate, xmrPriceBtc));
 
-                    double calcRate = status.getBtcAmount() / status.getXmrPriceBtc();
+                    double calcRate = status.getBtcAmount() / status.getIncomingPriceBtc();
-                    Timber.i("Rates: %f / %f", calcRate, status.getXmrPriceBtc());
+                    Timber.d("Rates: %f / %f", calcRate, status.getIncomingPriceBtc());
 
                     tvTxBtcAddress.setText(status.getBtcDestAddress()); // TODO test if this is different?
 
-                    Timber.i("Expires @ %s, in %s seconds", status.getExpiresAt().toString(), status.getSecondsTillTimeout());
+                    Timber.d("Expires @ %s, in %s seconds", status.getExpiresAt().toString(), status.getSecondsTillTimeout());
 
-                    Timber.i("Status = %s", status.getState().toString());
+                    Timber.d("Status = %s", status.getState().toString());
                     tvTxXmrToKey.setText(status.getUuid());
 
-                    Timber.d("AmountRemaining=%f, XmrAmountTotal=%f", status.getXmrAmountRemaining(), status.getXmrAmountTotal());
+                    Timber.d("AmountRemaining=%f, XmrAmountTotal=%f", status.getRemainingAmountIncoming(), status.getIncomingAmountTotal());
                     hideProgress();
                     startSendTimer();
                     prepareSend();

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

@@ -138,12 +138,6 @@ public class SendBtcSuccessWizardFragment extends SendWizardFragment {
 
         btcData = (TxDataBtc) sendListener.getTxData();
         tvTxAddress.setText(btcData.getDestinationAddress());
-        String paymentId = btcData.getPaymentId();
-        if ((paymentId != null) && (!paymentId.isEmpty())) {
-            tvTxPaymentId.setText(btcData.getPaymentId());
-        } else {
-            tvTxPaymentId.setText("-");
-        }
 
         final PendingTx committedTx = sendListener.getCommittedTx();
         if (committedTx != null) {

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

@@ -70,7 +70,6 @@ public class SendConfirmWizardFragment extends SendWizardFragment implements Sen
     }
 
     private TextView tvTxAddress;
-    private TextView tvTxPaymentId;
     private TextView tvTxNotes;
     private TextView tvTxAmount;
     private TextView tvTxFee;
@@ -90,7 +89,6 @@ public class SendConfirmWizardFragment extends SendWizardFragment implements Sen
                 R.layout.fragment_send_confirm, container, false);
 
         tvTxAddress = view.findViewById(R.id.tvTxAddress);
-        tvTxPaymentId = view.findViewById(R.id.tvTxPaymentId);
         tvTxNotes = view.findViewById(R.id.tvTxNotes);
         tvTxAmount = view.findViewById(R.id.tvTxAmount);
         tvTxFee = view.findViewById(R.id.tvTxFee);
@@ -143,7 +141,12 @@ public class SendConfirmWizardFragment extends SendWizardFragment implements Sen
 
     void send() {
         sendListener.commitTransaction();
-        pbProgressSend.setVisibility(View.VISIBLE);
+        getActivity().runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                pbProgressSend.setVisibility(View.VISIBLE);
+            }
+        });
     }
 
     @Override
@@ -192,12 +195,6 @@ public class SendConfirmWizardFragment extends SendWizardFragment implements Sen
 
         final TxData txData = sendListener.getTxData();
         tvTxAddress.setText(txData.getDestinationAddress());
-        String paymentId = txData.getPaymentId();
-        if ((paymentId != null) && (!paymentId.isEmpty())) {
-            tvTxPaymentId.setText(txData.getPaymentId());
-        } else {
-            tvTxPaymentId.setText("-");
-        }
         UserNotes notes = sendListener.getTxData().getUserNotes();
         if ((notes != null) && (!notes.note.isEmpty())) {
             tvTxNotes.setText(notes.note);
@@ -233,103 +230,16 @@ public class SendConfirmWizardFragment extends SendWizardFragment implements Sen
     }
 
     public void preSend() {
-        final Activity activity = getActivity();
+        Helper.promptPassword(getContext(), getActivityCallback().getWalletName(), false, new Helper.PasswordAction() {
-        View promptsView = getLayoutInflater().inflate(R.layout.prompt_password, null);
-        android.app.AlertDialog.Builder alertDialogBuilder = new android.app.AlertDialog.Builder(activity);
-        alertDialogBuilder.setView(promptsView);
-
-        final TextInputLayout etPassword = promptsView.findViewById(R.id.etPassword);
-        etPassword.setHint(getString(R.string.prompt_send_password));
-
-        etPassword.getEditText().addTextChangedListener(new TextWatcher() {
             @Override
-            public void afterTextChanged(Editable s) {
+            public void act(String walletName, String password, boolean fingerprintUsed) {
-                if (etPassword.getError() != null) {
+                send();
-                    etPassword.setError(null);
-                }
             }
 
-            @Override
+            public void fail(String walletName, String password, boolean fingerprintUsed) {
-            public void beforeTextChanged(CharSequence s, int start,
+                bSend.setEnabled(true); // allow to try again
-                                          int count, int after) {
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start,
-                                      int before, int count) {
             }
         });
-
-        alertDialogBuilder
-                .setCancelable(false)
-                .setPositiveButton(getString(R.string.label_ok), new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int id) {
-                        String pass = etPassword.getEditText().getText().toString();
-                        if (getActivityCallback().verifyWalletPassword(pass)) {
-                            dialog.dismiss();
-                            Helper.hideKeyboardAlways(activity);
-                            send();
-                        } else {
-                            etPassword.setError(getString(R.string.bad_password));
-                        }
-                    }
-                })
-                .setNegativeButton(getString(R.string.label_cancel),
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int id) {
-                                Helper.hideKeyboardAlways(activity);
-                                dialog.cancel();
-                                bSend.setEnabled(true); // allow to try again
-                            }
-                        });
-
-        final android.app.AlertDialog passwordDialog = alertDialogBuilder.create();
-        passwordDialog.setOnShowListener(new DialogInterface.OnShowListener() {
-            @Override
-            public void onShow(DialogInterface dialog) {
-                Button button = ((android.app.AlertDialog) dialog).getButton(android.app.AlertDialog.BUTTON_POSITIVE);
-                button.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        String pass = etPassword.getEditText().getText().toString();
-                        if (getActivityCallback().verifyWalletPassword(pass)) {
-                            Helper.hideKeyboardAlways(activity);
-                            passwordDialog.dismiss();
-                            send();
-                        } else {
-                            etPassword.setError(getString(R.string.bad_password));
-                        }
-                    }
-                });
-            }
-        });
-
-        Helper.showKeyboard(passwordDialog);
-
-        // accept keyboard "ok"
-        etPassword.getEditText().setOnEditorActionListener(new TextView.OnEditorActionListener() {
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER) && (event.getAction() == KeyEvent.ACTION_DOWN))
-                        || (actionId == EditorInfo.IME_ACTION_DONE)) {
-                    String pass = etPassword.getEditText().getText().toString();
-                    if (getActivityCallback().verifyWalletPassword(pass)) {
-                        Helper.hideKeyboardAlways(activity);
-                        passwordDialog.dismiss();
-                        send();
-                    } else {
-                        etPassword.setError(getString(R.string.bad_password));
-                    }
-                    return true;
-                }
-                return false;
-            }
-        });
-        // set FLAG_SECURE to prevent screenshots in Release Mode
-        if (!(BuildConfig.DEBUG && BuildConfig.FLAVOR_type.equals("alpha"))) {
-            passwordDialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
-        }
-
-        passwordDialog.show();
     }
 
     // creates a pending transaction and calls us back with transactionCreated()

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

@@ -75,7 +75,7 @@ public class SendFragment extends Fragment
 
         void onPrepareSend(String tag, TxData data);
 
-        boolean verifyWalletPassword(String password);
+        String getWalletName();
 
         void onSend(UserNotes notes);
 

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

@@ -111,12 +111,6 @@ public class SendSuccessWizardFragment extends SendWizardFragment {
 
         final TxData txData = sendListener.getTxData();
         tvTxAddress.setText(txData.getDestinationAddress());
-        String paymentId = txData.getPaymentId();
-        if ((paymentId != null) && (!paymentId.isEmpty())) {
-            tvTxPaymentId.setText(txData.getPaymentId());
-        } else {
-            tvTxPaymentId.setText("-");
-        }
 
         final PendingTx committedTx = sendListener.getCommittedTx();
         if (committedTx != null) {