Random fixes (#228)

* adapt for android studio 3.1 and remove witness

* set networktype from node

* add monero logging for DEBUG builds

* do not reset timestamps in apk

* no witness

* new version & apk naming

.circleci/config.yml

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

.gitignore

@@ -3,6 +3,8 @@
 *.iml
 /.idea/libraries
 /.idea/workspace.xml
+/.idea/caches
+/.idea/codeStyles
 /local.properties
 /captures
 .externalNativeBuild

README.md

@@ -3,6 +3,7 @@ Another Android Monero Wallet
 
 ### QUICKSTART
 - Download the APK for the most current release [here](https://github.com/m2049r/xmrwallet/releases) and install it
+- Alternatively add our F-Droid repo https://f-droid.monerujo.io/fdroid/repo with fingerpint ```A8 2C 68 E1 4A F0 AA 6A 2E C2 0E 6B 27 2E FF 25 E5 A0 38 F3 F6 58 84 31 6E 0F 5E 0D 91 E7 B7 13``` to your F-Droid client
 - Run the App and select "Generate Wallet" to create a new wallet or recover a wallet
 - Advanced users can copy over synced wallet files (all files) onto sdcard in directory Monerujo (created first time App is started)
 - See the [FAQ](doc/FAQ.md)
@@ -11,22 +12,19 @@ Another Android Monero Wallet
 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.0.0 with PR #2289 applied
+- 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
 - use your own daemon - it's easy
 - screen stays on until first sync is complete
-- saves wallet only on first sync and when sending transactions or editing notes
 - Monerujo means "Monero Wallet" according to https://www.reddit.com/r/Monero/comments/3exy7t/esperanto_corner/
 
 ### TODO
-- more sensible error dialogs
+- see taiga.getmonero.org & issues on github
 
 ### Issues / Pitfalls
-- The backups folder is now called "backups" and not ".backups" - which in most file explorers was a hidden folder
-- Wallets are now created directly in the "monerujo" folder, and not in the ".new" folder as before
-- You may want to check the old folders with a file browsing app and delete the ".new" and ".backups" folders AFTER moving neccessary wallet files to the new locations. Or simply make new backups from within Monerujo.
+- You should backup your wallet files in the "monerujo" folder periodically.
 - Also note, that on some devices the backups will only be visible on a PC over USB after a reboot of the device (it's an Android bug/feature)
 - Created wallets on a private testnet are unusable because the restore height is set to that
 of the "real" testnet.  After creating a new wallet, make a **new** one by recovering from the seed.
@@ -36,7 +34,7 @@ The official monero client shows the same behaviour.
 No need to build. Binaries are included:
 
 - openssl-1.0.2l
-- monero-v0.11.0.0 + pull requests #2289
+- monero-v0.11.1.0
 - boost_1_64_0
 
 If you want to build them yourself (recommended) check out [the instructions](doc/BUILDING-external-libs.md)

app/CMakeLists.txt

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

app/build.gradle

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

app/src/debug/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name" translatable="false">monerujo - Debug</string>
+</resources>

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

@@ -21,7 +21,9 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.design.widget.TextInputLayout;
 import android.support.v4.app.Fragment;
+import android.text.Editable;
 import android.text.InputType;
+import android.text.TextWatcher;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -32,12 +34,18 @@ import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
 import android.widget.TextView;
 
+import com.m2049r.xmrwallet.util.RestoreHeight;
 import com.m2049r.xmrwallet.widget.Toolbar;
 import com.m2049r.xmrwallet.model.Wallet;
 import com.m2049r.xmrwallet.model.WalletManager;
 import com.m2049r.xmrwallet.util.Helper;
+import com.nulabinc.zxcvbn.Strength;
+import com.nulabinc.zxcvbn.Zxcvbn;
 
 import java.io.File;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
 
 import timber.log.Timber;
 
@@ -125,7 +133,7 @@ public class GenerateFragment extends Fragment {
         });
 
         Helper.showKeyboard(getActivity());
-//##############
+
         etWalletName.getEditText().setOnEditorActionListener(new TextView.OnEditorActionListener() {
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
                 if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) || (actionId == EditorInfo.IME_ACTION_NEXT)) {
@@ -231,9 +239,7 @@ public class GenerateFragment extends Fragment {
         }
         if (!type.equals(TYPE_NEW)) {
             etWalletRestoreHeight.setVisibility(View.VISIBLE);
-            etWalletRestoreHeight.getEditText().setOnEditorActionListener(new TextView.OnEditorActionListener()
-
-            {
+            etWalletRestoreHeight.getEditText().setOnEditorActionListener(new TextView.OnEditorActionListener() {
                 public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
                     if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) || (actionId == EditorInfo.IME_ACTION_DONE)) {
                         Helper.hideKeyboard(getActivity());
@@ -254,11 +260,61 @@ 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();
 
         return view;
     }
 
+    Zxcvbn zxcvbn = new Zxcvbn();
+
+    // initialize zxcvbn engine in background thread
+    private void initZxcvbn() {
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                zxcvbn.measure("");
+            }
+        }).start();
+    }
+
+    private void checkPassword() {
+        String password = etWalletPassword.getEditText().getText().toString();
+        if (!password.isEmpty()) {
+            Strength strength = zxcvbn.measure(password);
+            int msg;
+            double guessesLog10 = strength.getGuessesLog10();
+            if (guessesLog10 < 10)
+                msg = R.string.password_weak;
+            else if (guessesLog10 < 11)
+                msg = R.string.password_fair;
+            else if (guessesLog10 < 12)
+                msg = R.string.password_good;
+            else if (guessesLog10 < 13)
+                msg = R.string.password_strong;
+            else
+                msg = R.string.password_very_strong;
+            etWalletPassword.setError(getResources().getString(msg));
+        } else {
+            etWalletPassword.setError(null);
+        }
+    }
+
     private boolean checkName() {
         String name = etWalletName.getEditText().getText().toString();
         boolean ok = true;
@@ -281,6 +337,42 @@ public class GenerateFragment extends Fragment {
         return ok;
     }
 
+    private boolean checkHeight() {
+        long height = !type.equals(TYPE_NEW) ? getHeight() : 0;
+        boolean ok = true;
+        if (height < 0) {
+            etWalletRestoreHeight.setError(getString(R.string.generate_restoreheight_error));
+            ok = false;
+        }
+        if (ok) {
+            etWalletRestoreHeight.setError(null);
+        }
+        return ok;
+    }
+
+    private long getHeight() {
+        long height = 0;
+
+        String restoreHeight = etWalletRestoreHeight.getEditText().getText().toString().trim();
+        if (restoreHeight.isEmpty()) return -1;
+        try {
+            // is it a date?
+            SimpleDateFormat parser = new SimpleDateFormat("yyyy-MM-dd");
+            parser.setLenient(false);
+            parser.parse(restoreHeight);
+            height = RestoreHeight.getInstance().getHeight(restoreHeight);
+        } catch (ParseException exPE) {
+            try {
+                // or is it a height?
+                height = Long.parseLong(restoreHeight);
+            } catch (NumberFormatException exNFE) {
+                return -1;
+            }
+        }
+        Timber.d("Using Restore Height = %d", height);
+        return height;
+    }
+
     private boolean checkMnemonic() {
         String seed = etWalletMnemonic.getEditText().getText().toString();
         boolean ok = (seed.split("\\s").length == 25); // 25 words
@@ -294,7 +386,7 @@ public class GenerateFragment extends Fragment {
 
     private boolean checkAddress() {
         String address = etWalletAddress.getEditText().getText().toString();
-        boolean ok = Wallet.isAddressValid(address, WalletManager.getInstance().isTestNet());
+        boolean ok = Wallet.isAddressValid(address);
         if (!ok) {
             etWalletAddress.setError(getString(R.string.generate_check_address));
         } else {
@@ -327,15 +419,13 @@ public class GenerateFragment extends Fragment {
 
     private void generateWallet() {
         if (!checkName()) return;
+        if (!checkHeight()) return;
+
         String name = etWalletName.getEditText().getText().toString();
         String password = etWalletPassword.getEditText().getText().toString();
 
-        long height;
-        try {
-            height = Long.parseLong(etWalletRestoreHeight.getEditText().getText().toString());
-        } catch (NumberFormatException ex) {
-            height = 0; // Keep calm and carry on!
-        }
+        long height = getHeight();
+        if (height < 0) height = 0;
 
         if (type.equals(TYPE_NEW)) {
             bGenerate.setEnabled(false);

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

@@ -34,6 +34,7 @@ import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.m2049r.xmrwallet.model.NetworkType;
 import com.m2049r.xmrwallet.widget.Toolbar;
 import com.m2049r.xmrwallet.model.Wallet;
 import com.m2049r.xmrwallet.model.WalletManager;
@@ -81,7 +82,7 @@ public class GenerateReviewFragment extends Fragment {
 
         bAccept = (Button) view.findViewById(R.id.bAccept);
 
-        boolean testnet = WalletManager.getInstance().isTestNet();
+        boolean testnet = WalletManager.getInstance().getNetworkType() != NetworkType.NetworkType_Mainnet;
         tvWalletMnemonic.setTextIsSelectable(testnet);
         tvWalletSpendKey.setTextIsSelectable(testnet);
 
@@ -103,6 +104,7 @@ public class GenerateReviewFragment extends Fragment {
                 copyAddress();
             }
         });
+        bCopyAddress.setClickable(false);
         view.findViewById(R.id.bAdvancedInfo).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -184,6 +186,7 @@ public class GenerateReviewFragment extends Fragment {
             name = wallet.getName();
             status = wallet.getStatus();
             if (status != Wallet.Status.Status_Ok) {
+                Timber.e(wallet.getErrorString());
                 if (closeWallet) wallet.close();
                 return false;
             }
@@ -213,7 +216,7 @@ public class GenerateReviewFragment extends Fragment {
                 tvWalletViewKey.setText(viewKey);
                 tvWalletSpendKey.setText(spendKey);
                 bAdvancedInfo.setVisibility(View.VISIBLE);
-                bCopyAddress.setEnabled(true);
+                bCopyAddress.setClickable(true);
                 bCopyAddress.setImageResource(R.drawable.ic_content_copy_black_24dp);
                 activityCallback.setTitle(name, getString(R.string.details_title));
                 activityCallback.setToolbarButton(

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

@@ -46,6 +46,7 @@ import com.google.zxing.WriterException;
 import com.google.zxing.common.BitMatrix;
 import com.google.zxing.qrcode.QRCodeWriter;
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import com.m2049r.xmrwallet.data.BarcodeData;
 import com.m2049r.xmrwallet.model.Wallet;
 import com.m2049r.xmrwallet.model.WalletManager;
 import com.m2049r.xmrwallet.util.Helper;
@@ -105,6 +106,7 @@ public class ReceiveFragment extends Fragment {
                 copyAddress();
             }
         });
+        bCopyAddress.setClickable(false);
 
         evAmount.setOnNewAmountListener(new ExchangeView.OnNewAmountListener() {
             @Override
@@ -239,7 +241,7 @@ public class ReceiveFragment extends Fragment {
         tvAddress.setText(address);
         etPaymentId.setEnabled(true);
         bPaymentId.setEnabled(true);
-        bCopyAddress.setEnabled(true);
+        bCopyAddress.setClickable(true);
         bCopyAddress.setImageResource(R.drawable.ic_content_copy_black_24dp);
         hideProgress();
         generateQr();
@@ -298,20 +300,20 @@ public class ReceiveFragment extends Fragment {
         String paymentId = etPaymentId.getEditText().getText().toString();
         String xmrAmount = evAmount.getAmount();
         Timber.d("%s/%s/%s", xmrAmount, paymentId, address);
-        if ((xmrAmount == null) || !Wallet.isAddressValid(address, WalletManager.getInstance().isTestNet())) {
+        if ((xmrAmount == null) || !Wallet.isAddressValid(address)) {
             clearQR();
             Timber.d("CLEARQR");
             return;
         }
         StringBuffer sb = new StringBuffer();
-        sb.append(ScannerFragment.QR_SCHEME).append(address);
+        sb.append(BarcodeData.XMR_SCHEME).append(address);
         boolean first = true;
         if (!paymentId.isEmpty()) {
             if (first) {
                 sb.append("?");
                 first = false;
             }
-            sb.append(ScannerFragment.QR_PAYMENTID).append('=').append(paymentId);
+            sb.append(BarcodeData.XMR_PAYMENTID).append('=').append(paymentId);
         }
         if (!xmrAmount.isEmpty()) {
             if (first) {
@@ -319,7 +321,7 @@ public class ReceiveFragment extends Fragment {
             } else {
                 sb.append("&");
             }
-            sb.append(ScannerFragment.QR_AMOUNT).append('=').append(xmrAmount);
+            sb.append(BarcodeData.XMR_AMOUNT).append('=').append(xmrAmount);
         }
         String text = sb.toString();
         int size = Math.min(qrCode.getHeight(), qrCode.getWidth());

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

@@ -36,7 +36,7 @@ public class ScannerFragment extends Fragment implements ZXingScannerView.Result
     private OnScannedListener onScannedListener;
 
     public interface OnScannedListener {
-        boolean onScanned(String uri);
+        boolean onScanned(String qrCode);
     }
 
     private ZXingScannerView mScannerView;
@@ -56,10 +56,6 @@ public class ScannerFragment extends Fragment implements ZXingScannerView.Result
         mScannerView.startCamera();
     }
 
-    static final String QR_SCHEME = "monero:";
-    static final String QR_PAYMENTID = "tx_payment_id";
-    static final String QR_AMOUNT = "tx_amount";
-
     @Override
     public void handleResult(Result rawResult) {
         if ((rawResult.getBarcodeFormat() == BarcodeFormat.QR_CODE)) {

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

@@ -20,6 +20,10 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 
+import com.m2049r.xmrwallet.util.Helper;
+
+import java.io.File;
+
 import static android.view.WindowManager.LayoutParams;
 
 public abstract class SecureActivity extends AppCompatActivity {

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

@@ -30,10 +30,13 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.m2049r.xmrwallet.model.TransactionInfo;
 import com.m2049r.xmrwallet.model.Transfer;
 import com.m2049r.xmrwallet.model.Wallet;
+import com.m2049r.xmrwallet.util.Helper;
+import com.m2049r.xmrwallet.util.UserNotes;
 import com.m2049r.xmrwallet.widget.Toolbar;
 
 import java.text.SimpleDateFormat;
@@ -68,12 +71,23 @@ public class TxFragment extends Fragment {
     private TextView etTxNotes;
     private Button bTxNotes;
 
+    // XMRTO stuff
+    private View cvXmrTo;
+    private TextView tvTxXmrToKey;
+    private TextView tvDestinationBtc;
+    private TextView tvTxAmountBtc;
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
 
         View view = inflater.inflate(R.layout.fragment_tx_info, container, false);
 
+        cvXmrTo = view.findViewById(R.id.cvXmrTo);
+        tvTxXmrToKey = (TextView) view.findViewById(R.id.tvTxXmrToKey);
+        tvDestinationBtc = (TextView) view.findViewById(R.id.tvDestinationBtc);
+        tvTxAmountBtc = (TextView) view.findViewById(R.id.tvTxAmountBtc);
+
         tvTxTimestamp = (TextView) view.findViewById(R.id.tvTxTimestamp);
         tvTxId = (TextView) view.findViewById(R.id.tvTxId);
         tvTxKey = (TextView) view.findViewById(R.id.tvTxKey);
@@ -94,7 +108,16 @@ public class TxFragment extends Fragment {
                 info.notes = null; // force reload on next view
                 bTxNotes.setEnabled(false);
                 etTxNotes.setEnabled(false);
-                activityCallback.onSetNote(info.hash, etTxNotes.getText().toString());
+                userNotes.setNote(etTxNotes.getText().toString());
+                activityCallback.onSetNote(info.hash, userNotes.txNotes);
+            }
+        });
+
+        tvTxXmrToKey.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Helper.clipBoardCopy(getActivity(), getString(R.string.label_copy_xmrtokey), tvTxXmrToKey.getText().toString());
+                Toast.makeText(getActivity(), getString(R.string.message_copy_xmrtokey), Toast.LENGTH_SHORT).show();
             }
         });
 
@@ -175,12 +198,14 @@ public class TxFragment extends Fragment {
     }
 
     TransactionInfo info = null;
+    UserNotes userNotes = null;
 
     void loadNotes(TransactionInfo info) {
-        if (info.notes == null) {
+        if ((userNotes == null) || (info.notes == null)) {
             info.notes = activityCallback.getTxNotes(info.hash);
         }
-        etTxNotes.setText(info.notes);
+        userNotes = new UserNotes(info.notes);
+        etTxNotes.setText(userNotes.note);
     }
 
     private void setTxColour(int clr) {
@@ -266,8 +291,21 @@ public class TxFragment extends Fragment {
         tvTxTransfers.setText(sb.toString());
         tvDestination.setText(dstSb.toString());
         this.info = info;
+        showBtcInfo();
     }
 
+    void showBtcInfo() {
+        if (userNotes.xmrtoKey != null) {
+            cvXmrTo.setVisibility(View.VISIBLE);
+            tvTxXmrToKey.setText(userNotes.xmrtoKey);
+            tvDestinationBtc.setText(userNotes.xmrtoDestination);
+            tvTxAmountBtc.setText(userNotes.xmrtoAmount + " BTC");
+        } else {
+            cvXmrTo.setVisibility(View.GONE);
+        }
+    }
+
+
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

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

@@ -22,8 +22,8 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.net.Uri;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.PowerManager;
@@ -36,19 +36,20 @@ import android.widget.Toast;
 
 import com.m2049r.xmrwallet.data.BarcodeData;
 import com.m2049r.xmrwallet.data.TxData;
-import com.m2049r.xmrwallet.dialog.DonationFragment;
+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.model.PendingTransaction;
 import com.m2049r.xmrwallet.model.TransactionInfo;
 import com.m2049r.xmrwallet.model.Wallet;
 import com.m2049r.xmrwallet.model.WalletManager;
 import com.m2049r.xmrwallet.service.WalletService;
 import com.m2049r.xmrwallet.util.Helper;
+import com.m2049r.xmrwallet.util.UserNotes;
 import com.m2049r.xmrwallet.widget.Toolbar;
 
 import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
 
 import timber.log.Timber;
 
@@ -140,6 +141,9 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
     @Override
     protected void onDestroy() {
         Timber.d("onDestroy()");
+        if ((mBoundService != null) && !isSynced() && (getWallet() != null)) {
+            saveWallet();
+        }
         stopWalletService();
         super.onDestroy();
     }
@@ -155,8 +159,8 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
             case R.id.action_info:
                 onWalletDetails();
                 return true;
-            case R.id.action_donate:
-                DonationFragment.display(getSupportFragmentManager());
+            case R.id.action_credits:
+                CreditsFragment.display(getSupportFragmentManager());
                 return true;
             case R.id.action_share:
                 onShareTxInfo();
@@ -209,8 +213,8 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
                     case Toolbar.BUTTON_CLOSE:
                         finish();
                         break;
-                    case Toolbar.BUTTON_DONATE:
-                        Toast.makeText(WalletActivity.this, getString(R.string.label_donate), Toast.LENGTH_SHORT).show();
+                    case Toolbar.BUTTON_CREDITS:
+                        Toast.makeText(WalletActivity.this, getString(R.string.label_credits), Toast.LENGTH_SHORT).show();
                     case Toolbar.BUTTON_NONE:
                     default:
                         Timber.e("Button " + type + "pressed - how can this be?");
@@ -218,12 +222,7 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
             }
         });
 
-        boolean testnet = WalletManager.getInstance().isTestNet();
-        if (testnet) {
-            toolbar.setBackgroundResource(R.color.colorPrimaryDark);
-        } else {
-            toolbar.setBackgroundResource(R.drawable.backgound_toolbar_mainnet);
-        }
+        showNet();
 
         Fragment walletFragment = new WalletFragment();
         getSupportFragmentManager().beginTransaction()
@@ -234,6 +233,23 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
         Timber.d("onCreate() done.");
     }
 
+    public void showNet() {
+        switch (WalletManager.getInstance().getNetworkType()) {
+            case NetworkType_Mainnet:
+                toolbar.setBackgroundResource(R.drawable.backgound_toolbar_mainnet);
+                break;
+            case NetworkType_Testnet:
+                toolbar.setBackgroundResource(R.color.colorPrimaryDark);
+                break;
+            case NetworkType_Stagenet:
+                toolbar.setBackgroundResource(R.color.colorPrimaryDark);
+                break;
+            default:
+                throw new IllegalStateException("Unsupported Network: " + WalletManager.getInstance().getNetworkType());
+        }
+    }
+
+
     public Wallet getWallet() {
         if (mBoundService == null) throw new IllegalStateException("WalletService not bound.");
         return mBoundService.getWallet();
@@ -465,7 +481,7 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
     }
 
     @Override
-    public void onTransactionCreated(final PendingTransaction pendingTransaction) {
+    public void onTransactionCreated(final String txTag, final PendingTransaction pendingTransaction) {
         try {
             final SendFragment sendFragment = (SendFragment)
                     getSupportFragmentManager().findFragmentById(R.id.fragment_container);
@@ -477,7 +493,7 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
                         getWallet().disposePendingTransaction();
                         sendFragment.onCreateTransactionFailed(errorText);
                     } else {
-                        sendFragment.onTransactionCreated(pendingTransaction);
+                        sendFragment.onTransactionCreated(txTag, pendingTransaction);
                     }
                 }
             });
@@ -560,19 +576,20 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
 
     @Override
     public void onProgress(final int n) {
-        try {
-            final WalletFragment walletFragment = (WalletFragment)
-                    getSupportFragmentManager().findFragmentByTag(WalletFragment.class.getName());
-            runOnUiThread(new Runnable() {
-                public void run() {
-                    walletFragment.setProgress(n);
+        runOnUiThread(new Runnable() {
+            public void run() {
+                try {
+                    WalletFragment walletFragment = (WalletFragment)
+                            getSupportFragmentManager().findFragmentByTag(WalletFragment.class.getName());
+                    if (walletFragment != null)
+                        walletFragment.setProgress(n);
+                } catch (ClassCastException ex) {
+                    // not in wallet fragment (probably send monero)
+                    Timber.d(ex.getLocalizedMessage());
+                    // keep calm and carry on
                 }
-            });
-        } catch (ClassCastException ex) {
-            // not in wallet fragment (probably send monero)
-            Timber.d(ex.getLocalizedMessage());
-            // keep calm and carry on
-        }
+            }
+        });
     }
 
     private void updateProgress() {
@@ -588,11 +605,11 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
 ///////////////////////////
 
     @Override
-    public void onSend(String notes) {
+    public void onSend(UserNotes notes) {
         if (mIsBound) { // no point in talking to unbound service
             Intent intent = new Intent(getApplicationContext(), WalletService.class);
             intent.putExtra(WalletService.REQUEST, WalletService.REQUEST_CMD_SEND);
-            intent.putExtra(WalletService.REQUEST_CMD_SEND_NOTES, notes);
+            intent.putExtra(WalletService.REQUEST_CMD_SEND_NOTES, notes.txNotes);
             startService(intent);
             Timber.d("SEND TX request sent");
         } else {
@@ -617,11 +634,12 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
     }
 
     @Override
-    public void onPrepareSend(TxData txData) {
+    public void onPrepareSend(final String tag, final TxData txData) {
         if (mIsBound) { // no point in talking to unbound service
             Intent intent = new Intent(getApplicationContext(), WalletService.class);
             intent.putExtra(WalletService.REQUEST, WalletService.REQUEST_CMD_TX);
             intent.putExtra(WalletService.REQUEST_CMD_TX_DATA, txData);
+            intent.putExtra(WalletService.REQUEST_CMD_TX_TAG, tag);
             startService(intent);
             Timber.d("CREATE TX request sent");
         } else {
@@ -694,6 +712,7 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
 
     @Override
     public void onDisposeRequest() {
+        //TODO consider doing this through the WalletService to avoid concurrency issues
         getWallet().disposePendingTransaction();
     }
 
@@ -791,7 +810,7 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
 
     @Override
     public boolean verifyWalletPassword(String password) {
-        String walletPath = new File(Helper.getStorageRoot(this),
+        String walletPath = new File(Helper.getWalletRoot(this),
                 getWalletName() + ".keys").getAbsolutePath();
         return WalletManager.getInstance().verifyWalletPassword(walletPath, password, true);
     }
@@ -804,9 +823,6 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
                 super.onBackPressed();
             }
         } else {
-            if (!isSynced()) {
-                saveWallet();
-            }
             super.onBackPressed();
         }
     }
@@ -815,4 +831,10 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
     public void onFragmentDone() {
         popFragmentStack(null);
     }
+
+    @Override
+    public SharedPreferences getPrefs() {
+        return getPreferences(Context.MODE_PRIVATE);
+    }
+
 }

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

@@ -313,7 +313,7 @@ public class WalletFragment extends Fragment
         if (wallet == null) return;
         walletTitle = wallet.getName();
         String watchOnly = (wallet.isWatchOnly() ? getString(R.string.label_watchonly) : "");
-        walletSubtitle = wallet.getAddress().substring(0, 16) + "…" + watchOnly;
+        walletSubtitle = wallet.getAddress().substring(0, 10) + "…" + watchOnly;
         activityCallback.setTitle(walletTitle, walletSubtitle);
         Timber.d("wallet title is %s", walletTitle);
     }

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

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

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

@@ -18,7 +18,10 @@ package com.m2049r.xmrwallet.data;
 
 import android.net.Uri;
 
+import com.m2049r.xmrwallet.model.NetworkType;
 import com.m2049r.xmrwallet.model.Wallet;
+import com.m2049r.xmrwallet.model.WalletManager;
+import com.m2049r.xmrwallet.util.BitcoinAddressValidator;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -34,7 +37,7 @@ public class BarcodeData {
     static final String BTC_AMOUNT = "amount";
 
     public enum Asset {
-        XMR
+        XMR, BTC
     }
 
     public Asset asset = null;
@@ -67,6 +70,14 @@ public class BarcodeData {
         if (bcData == null) {
             bcData = parseMoneroNaked(qrCode);
         }
+        // check for btc uri
+        if (bcData == null) {
+            bcData = parseBitcoinUri(qrCode);
+        }
+        // check for naked btc addres
+        if (bcData == null) {
+            bcData = parseBitcoinNaked(qrCode);
+        }
         return bcData;
     }
 
@@ -134,4 +145,57 @@ public class BarcodeData {
 
         return new BarcodeData(Asset.XMR, address);
     }
+
+    // bitcoin:mpQ84J43EURZHkCnXbyQ4PpNDLLBqdsMW2?amount=0.01
+    static public BarcodeData parseBitcoinUri(String uri) {
+        Timber.d("parseBitcoinUri=%s", uri);
+
+        if (uri == null) return null;
+
+        if (!uri.startsWith(BTC_SCHEME)) return null;
+
+        String noScheme = uri.substring(BTC_SCHEME.length());
+        Uri bitcoin = Uri.parse(noScheme);
+        Map<String, String> parms = new HashMap<>();
+        String query = bitcoin.getQuery();
+        if (query != null) {
+            String[] args = query.split("&");
+            for (String arg : args) {
+                String[] namevalue = arg.split("=");
+                if (namevalue.length == 0) {
+                    continue;
+                }
+                parms.put(Uri.decode(namevalue[0]).toLowerCase(),
+                        namevalue.length > 1 ? Uri.decode(namevalue[1]) : "");
+            }
+        }
+        String address = bitcoin.getPath();
+        String amount = parms.get(BTC_AMOUNT);
+        if (amount != null) {
+            try {
+                Double.parseDouble(amount);
+            } catch (NumberFormatException ex) {
+                Timber.d(ex.getLocalizedMessage());
+                return null; // we have an amount but its not a number!
+            }
+        }
+        if (!BitcoinAddressValidator.validate(address)) {
+            Timber.d("address invalid");
+            return null;
+        }
+        return new BarcodeData(BarcodeData.Asset.BTC, address, amount);
+    }
+
+    static public BarcodeData parseBitcoinNaked(String address) {
+        Timber.d("parseBitcoinNaked=%s", address);
+
+        if (address == null) return null;
+
+        if (!BitcoinAddressValidator.validate(address)) {
+            Timber.d("address invalid");
+            return null;
+        }
+
+        return new BarcodeData(BarcodeData.Asset.BTC, address);
+    }
 }

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

@@ -20,36 +20,38 @@ import android.os.Parcel;
 import android.os.Parcelable;
 
 import com.m2049r.xmrwallet.model.PendingTransaction;
+import com.m2049r.xmrwallet.util.UserNotes;
+
+import timber.log.Timber;
 
 // https://stackoverflow.com/questions/2139134/how-to-send-an-object-from-one-android-activity-to-another-using-intents
 public class TxData implements Parcelable {
 
+    public TxData() {
+    }
+
     public TxData(TxData txData) {
-        this.dst_addr = txData.dst_addr;
+        this.dstAddr = txData.dstAddr;
         this.paymentId = txData.paymentId;
         this.amount = txData.amount;
         this.mixin = txData.mixin;
         this.priority = txData.priority;
     }
 
-    public TxData(String dst_addr,
+    public TxData(String dstAddr,
                   String paymentId,
                   long amount,
                   int mixin,
                   PendingTransaction.Priority priority) {
-        this.dst_addr = dst_addr;
+        this.dstAddr = dstAddr;
         this.paymentId = paymentId;
         this.amount = amount;
         this.mixin = mixin;
         this.priority = priority;
     }
 
-    public long getFee() {
-        return 0L;
-    }
-
     public String getDestinationAddress() {
-        return dst_addr;
+        return dstAddr;
     }
 
     public String getPaymentId() {
@@ -68,15 +70,45 @@ public class TxData implements Parcelable {
         return priority;
     }
 
-    final private String dst_addr;
-    final private String paymentId;
-    final private long amount;
-    final private int mixin;
-    final private PendingTransaction.Priority priority;
+    public void setDestinationAddress(String dstAddr) {
+        this.dstAddr = dstAddr;
+    }
+
+    public void setPaymentId(String paymentId) {
+        this.paymentId = paymentId;
+    }
+
+    public void setAmount(long amount) {
+        this.amount = amount;
+    }
+
+    public void setMixin(int mixin) {
+        this.mixin = mixin;
+    }
+
+    public void setPriority(PendingTransaction.Priority priority) {
+        this.priority = priority;
+    }
+
+    public UserNotes getUserNotes() {
+        return userNotes;
+    }
+
+    public void setUserNotes(UserNotes userNotes) {
+        this.userNotes = userNotes;
+    }
+
+    private String dstAddr;
+    private String paymentId;
+    private long amount;
+    private int mixin;
+    private PendingTransaction.Priority priority;
+
+    private UserNotes userNotes;
 
     @Override
     public void writeToParcel(Parcel out, int flags) {
-        out.writeString(dst_addr);
+        out.writeString(dstAddr);
         out.writeString(paymentId);
         out.writeLong(amount);
         out.writeInt(mixin);
@@ -94,8 +126,8 @@ public class TxData implements Parcelable {
         }
     };
 
-    private TxData(Parcel in) {
-        dst_addr = in.readString();
+    protected TxData(Parcel in) {
+        dstAddr = in.readString();
         paymentId = in.readString();
         amount = in.readLong();
         mixin = in.readInt();
@@ -111,8 +143,8 @@ public class TxData implements Parcelable {
     @Override
     public String toString() {
         StringBuffer sb = new StringBuffer();
-        sb.append("dst_addr:");
-        sb.append(dst_addr);
+        sb.append("dstAddr:");
+        sb.append(dstAddr);
         sb.append(",paymentId:");
         sb.append(paymentId);
         sb.append(",amount:");

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

@@ -0,0 +1,98 @@
+/*
+ * 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.data;
+
+import android.os.Parcel;
+
+import com.m2049r.xmrwallet.model.PendingTransaction;
+
+public class TxDataBtc extends TxData {
+
+    private String xmrtoUuid;
+    private String btcAddress;
+    private double btcAmount;
+
+    public TxDataBtc() {
+        super();
+    }
+
+    public TxDataBtc(TxDataBtc txDataBtc) {
+        super(txDataBtc);
+    }
+
+    public String getXmrtoUuid() {
+        return xmrtoUuid;
+    }
+
+    public void setXmrtoUuid(String xmrtoUuid) {
+        this.xmrtoUuid = xmrtoUuid;
+    }
+
+    public String getBtcAddress() {
+        return btcAddress;
+    }
+
+    public void setBtcAddress(String btcAddress) {
+        this.btcAddress = btcAddress;
+    }
+
+    public double getBtcAmount() {
+        return btcAmount;
+    }
+
+    public void setBtcAmount(double btcAmount) {
+        this.btcAmount = btcAmount;
+    }
+
+    @Override
+    public void writeToParcel(Parcel out, int flags) {
+        super.writeToParcel(out, flags);
+        out.writeString(xmrtoUuid);
+        out.writeString(btcAddress);
+        out.writeDouble(btcAmount);
+    }
+
+    // this is used to regenerate your object. All Parcelables must have a CREATOR that implements these two methods
+    public static final Creator<TxDataBtc> CREATOR = new Creator<TxDataBtc>() {
+        public TxDataBtc createFromParcel(Parcel in) {
+            return new TxDataBtc(in);
+        }
+
+        public TxDataBtc[] newArray(int size) {
+            return new TxDataBtc[size];
+        }
+    };
+
+    protected TxDataBtc(Parcel in) {
+        super(in);
+        xmrtoUuid = in.readString();
+        btcAddress = in.readString();
+        btcAmount = in.readDouble();
+    }
+
+    @Override
+    public String toString() {
+        StringBuffer sb = new StringBuffer();
+        sb.append(",xmrtoUuid:");
+        sb.append(xmrtoUuid);
+        sb.append(",btcAddress:");
+        sb.append(btcAddress);
+        sb.append(",btcAmount:");
+        sb.append(btcAmount);
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2018 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet.data;
+
+import com.m2049r.xmrwallet.model.NetworkType;
+
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+
+public class WalletNode {
+    private final String name;
+    private final String host;
+    private final int port;
+    private final String user;
+    private final String password;
+    private final NetworkType networkType;
+
+    public WalletNode(String walletName, String daemon, NetworkType networkType) {
+        if ((daemon == null) || daemon.isEmpty())
+            throw new IllegalArgumentException("daemon is empty");
+        this.name = walletName;
+        String daemonAddress;
+        String a[] = daemon.split("@");
+        if (a.length == 1) { // no credentials
+            daemonAddress = a[0];
+            user = "";
+            password = "";
+        } else if (a.length == 2) { // credentials
+            String userPassword[] = a[0].split(":");
+            if (userPassword.length != 2)
+                throw new IllegalArgumentException("User:Password invalid");
+            user = userPassword[0];
+            if (!user.isEmpty()) {
+                password = userPassword[1];
+            } else {
+                password = "";
+            }
+            daemonAddress = a[1];
+        } else {
+            throw new IllegalArgumentException("Too many @");
+        }
+
+        String da[] = daemonAddress.split(":");
+        if ((da.length > 2) || (da.length < 1))
+            throw new IllegalArgumentException("Too many ':' or too few");
+        host = da[0];
+        if (da.length == 2) {
+            try {
+                port = Integer.parseInt(da[1]);
+            } catch (NumberFormatException ex) {
+                throw new IllegalArgumentException("Port not numeric");
+            }
+        } else {
+            switch (networkType) {
+                case NetworkType_Mainnet:
+                    port = 18081;
+                    break;
+                case NetworkType_Testnet:
+                    port = 28081;
+                    break;
+                case NetworkType_Stagenet:
+                    port = 38081;
+                    break;
+                default:
+                    port = 0;
+            }
+        }
+        this.networkType = networkType;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public NetworkType getNetworkType() {
+        return networkType;
+    }
+
+    public String getAddress() {
+        return host + ":" + port;
+    }
+
+    public String getUsername() {
+        return user;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public SocketAddress getSocketAddress() {
+        return new InetSocketAddress(host, port);
+    }
+
+    public boolean isValid() {
+        return !host.isEmpty();
+    }
+}

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

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

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

@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package com.m2049r.xmrwallet;
+package com.m2049r.xmrwallet.fragment.send;
 
 import android.content.Context;
 import android.os.Bundle;
 import android.support.design.widget.TextInputLayout;
 import android.support.v7.widget.CardView;
 import android.text.Editable;
+import android.text.Html;
 import android.text.InputType;
 import android.text.TextWatcher;
 import android.view.KeyEvent;
@@ -32,9 +33,13 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
+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.Wallet;
 import com.m2049r.xmrwallet.model.WalletManager;
+import com.m2049r.xmrwallet.util.BitcoinAddressValidator;
 import com.m2049r.xmrwallet.util.Helper;
 
 import timber.log.Timber;
@@ -56,12 +61,12 @@ public class SendAddressWizardFragment extends SendWizardFragment {
         return this;
     }
 
-    interface Listener {
-        void setAddress(final String address);
-
-        void setPaymentId(final String paymentId);
-
+    public interface Listener {
         void setBarcodeData(BarcodeData data);
+
+        void setMode(SendFragment.Mode mode);
+
+        TxData getTxData();
     }
 
     private EditText etDummy;
@@ -71,6 +76,8 @@ public class SendAddressWizardFragment extends SendWizardFragment {
     private CardView cvScan;
     private View tvPaymentIdIntegrated;
     private View llPaymentId;
+    private TextView tvXmrTo;
+    private View llXmrTo;
 
     OnScanListener onScanListener;
 
@@ -89,6 +96,9 @@ public class SendAddressWizardFragment extends SendWizardFragment {
 
         tvPaymentIdIntegrated = view.findViewById(R.id.tvPaymentIdIntegrated);
         llPaymentId = view.findViewById(R.id.llPaymentId);
+        llXmrTo = view.findViewById(R.id.llXmrTo);
+        tvXmrTo = (TextView) view.findViewById(R.id.tvXmrTo);
+        tvXmrTo.setText(Html.fromHtml(getString(R.string.info_xmrto)));
 
         etAddress = (TextInputLayout) view.findViewById(R.id.etAddress);
         etAddress.getEditText().setRawInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
@@ -113,12 +123,25 @@ public class SendAddressWizardFragment extends SendWizardFragment {
             public void afterTextChanged(Editable editable) {
                 etAddress.setError(null);
                 if (isIntegratedAddress()) {
+                    Timber.d("isIntegratedAddress");
                     etPaymentId.getEditText().getText().clear();
-                    llPaymentId.setVisibility(View.GONE);
+                    llPaymentId.setVisibility(View.INVISIBLE);
                     tvPaymentIdIntegrated.setVisibility(View.VISIBLE);
-                } else { // we don't
+                    llXmrTo.setVisibility(View.INVISIBLE);
+                    sendListener.setMode(SendFragment.Mode.XMR);
+                } else if (isBitcoinAddress()) {
+                    Timber.d("isBitcoinAddress");
+                    etPaymentId.getEditText().getText().clear();
+                    llPaymentId.setVisibility(View.INVISIBLE);
+                    tvPaymentIdIntegrated.setVisibility(View.INVISIBLE);
+                    llXmrTo.setVisibility(View.VISIBLE);
+                    sendListener.setMode(SendFragment.Mode.BTC);
+                } else {
+                    Timber.d("isStandardAddress");
                     llPaymentId.setVisibility(View.VISIBLE);
-                    tvPaymentIdIntegrated.setVisibility(View.GONE);
+                    tvPaymentIdIntegrated.setVisibility(View.INVISIBLE);
+                    llXmrTo.setVisibility(View.INVISIBLE);
+                    sendListener.setMode(SendFragment.Mode.XMR);
                 }
             }
 
@@ -188,13 +211,14 @@ public class SendAddressWizardFragment extends SendWizardFragment {
 
     private boolean checkAddressNoError() {
         String address = etAddress.getEditText().getText().toString();
-        return Wallet.isAddressValid(address);
+        return Wallet.isAddressValid(address)
+                || BitcoinAddressValidator.validate(address);
     }
 
     private boolean checkAddress() {
         boolean ok = checkAddressNoError();
         if (!ok) {
-            etAddress.setError(getString(R.string.send_qr_address_invalid));
+            etAddress.setError(getString(R.string.send_address_invalid));
         } else {
             etAddress.setError(null);
         }
@@ -203,7 +227,16 @@ public class SendAddressWizardFragment extends SendWizardFragment {
 
     private boolean isIntegratedAddress() {
         String address = etAddress.getEditText().getText().toString();
-        return (address.length() == INTEGRATED_ADDRESS_LENGTH) && Wallet.isAddressValid(address);
+        return (address.length() == INTEGRATED_ADDRESS_LENGTH)
+                && Wallet.isAddressValid(address);
+    }
+
+    private boolean isBitcoinAddress() {
+        String address = etAddress.getEditText().getText().toString();
+        if ((address.length() >= 27) && (address.length() <= 34))
+            return BitcoinAddressValidator.validate(address);
+        else
+            return false;
     }
 
     private boolean checkPaymentId() {
@@ -235,8 +268,15 @@ public class SendAddressWizardFragment extends SendWizardFragment {
         }
         if (!ok) return false;
         if (sendListener != null) {
-            sendListener.setAddress(etAddress.getEditText().getText().toString());
-            sendListener.setPaymentId(etPaymentId.getEditText().getText().toString());
+            TxData txData = sendListener.getTxData();
+            if (isBitcoinAddress()) {
+                ((TxDataBtc) txData).setBtcAddress(etAddress.getEditText().getText().toString());
+                txData.setDestinationAddress(null);
+                txData.setPaymentId("");
+            } else {
+                txData.setDestinationAddress(etAddress.getEditText().getText().toString());
+                txData.setPaymentId(etPaymentId.getEditText().getText().toString());
+            }
         }
         return true;
     }

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.m2049r.xmrwallet;
+package com.m2049r.xmrwallet.fragment.send;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -22,10 +22,12 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import com.m2049r.xmrwallet.R;
 import com.m2049r.xmrwallet.data.BarcodeData;
-import com.m2049r.xmrwallet.widget.ExchangeTextView;
+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.NumberPadView;
 
 import timber.log.Timber;
@@ -48,7 +50,7 @@ public class SendAmountWizardFragment extends SendWizardFragment {
     interface Listener {
         SendFragment.Listener getActivityCallback();
 
-        void setAmount(final long amount);
+        TxData getTxData();
 
         BarcodeData popBarcodeData();
     }
@@ -99,9 +101,9 @@ public class SendAmountWizardFragment extends SendWizardFragment {
         if (sendListener != null) {
             String xmr = evAmount.getAmount();
             if (xmr != null) {
-                sendListener.setAmount(Wallet.getAmountFromString(xmr));
+                sendListener.getTxData().setAmount(Wallet.getAmountFromString(xmr));
             } else {
-                sendListener.setAmount(0L);
+                sendListener.getTxData().setAmount(0L);
             }
         }
         return true;