fix length test (#314)

* new version

* fix balance

.idea/.gitignore

@@ -0,0 +1,3 @@
+workspace.xml
+markdown-*
+misc.xml

.idea/.name

@@ -0,0 +1 @@
+xmrwallet

.idea/compiler.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <resourceExtensions />
+    <wildcardResourcePatterns>
+      <entry name="!?*.java" />
+      <entry name="!?*.form" />
+      <entry name="!?*.class" />
+      <entry name="!?*.groovy" />
+      <entry name="!?*.scala" />
+      <entry name="!?*.flex" />
+      <entry name="!?*.kt" />
+      <entry name="!?*.clj" />
+      <entry name="!?*.aj" />
+    </wildcardResourcePatterns>
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="false">
+        <processorPath useClasspath="true" />
+      </profile>
+    </annotationProcessing>
+  </component>
+</project>

.idea/copyright/profiles_settings.xml

@@ -0,0 +1,3 @@
+<component name="CopyrightManager">
+  <settings default="" />
+</component>

.idea/modules.xml

@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/aeonwallet.iml" filepath="$PROJECT_DIR$/aeonwallet.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/xmrwallet.iml" filepath="$PROJECT_DIR$/xmrwallet.iml" />
     </modules>
   </component>
 </project>

README.md

@@ -1,24 +1,34 @@
-# MonerujoAE
+# Monerujo
-The Android AEON Wallet
+Another Android Monero Wallet for Monero
+	**(not
+    Monero Classic,
+    Monero-Classic,
+    Monero Zero,
+    Monero Original,
+    Monero C,
+    Monero V)**
 
 ### QUICKSTART
-- Download the APK for the most current release [here](https://github.com/monerujo-io/aeonwallet/releases) and install it
+- 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://aeon.monerujo.io/fdroid/repo with fingerpint ```F8 20 2E E7 A8 D0 2D 07 AF B1 3D 5A 14 F2 9F 39 04 8C 4D 2D B3 87 76 11 03 5E F9 EA 20 6A 55 5D``` to your F-Droid client
+- 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 ```aeonwallet``` (created first time App is started)
+- 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)
 
 ## Translations
 Help us translate Monerujo! You can find instructions [On Taiga](https://taiga.getmonero.org/project/erciccione-monero-localization/wiki/monerujo), and if you need help/support, open an issue or contact the Localization Workgroup. You can find us on the freenode channel `#monero-translations`, also relayed on [MatterMost](https://mattermost.getmonero.org/monero/channels/monero-translations), and matrix/riot.
 
 ### Disclaimer
-You may lose all your AEON if you use this App.
+You may lose all your Moneroj if you use this App. Be cautious when spending on the mainnet.
 
 ### Random Notes
-- Based off aeon v0.12.0
+- Based off monero v0.11.1.0
-- works on the stagenet & mainnet
+- 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
+- Monerujo means "Monero Wallet" according to https://www.reddit.com/r/Monero/comments/3exy7t/esperanto_corner/
 
 ### TODO
 - see taiga.getmonero.org & issues on github
@@ -26,14 +36,23 @@ You may lose all your AEON if you use this App.
 ### Issues / Pitfalls
 - Users of Zenfone MAX & Zenfone 2 Laser (possibly others) **MUST** use the armeabi-v7a APK as the arm64-v8a build uses hardware AES
 functionality these models don't have.
-- You should backup your wallet files in the "aeonwallet" folder periodically.
+- 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" stagenet.  After creating a new wallet, make a **new** one by recovering from the seed.
+of the "real" testnet.  After creating a new wallet, make a **new** one by recovering from the seed.
-The official client shows the same behaviour.
+The official monero client shows the same behaviour.
 
 ### HOW TO BUILD
-Check out [the instructions](doc/BUILDING-external-libs.md)
+No need to build. Binaries are included:
+
+- openssl-1.0.2l
+- monero-v0.12
+- boost_1_58_0
+
+If you want to build them yourself (recommended) check out [the instructions](doc/BUILDING-external-libs.md)
+
+Then, fire up Android Studio and build the APK.
 
 ### Donations
-- Address: WmsfCJfmd6QQ84Rfb2mD1y7ryBzvTiQ8MMngmgRjxDMCCkeuChA9B9ZRNZyQyjgH1zdQMBXeQB9vZhUwPHmLGhyo2nMoE2ARv
+- Address: 4AdkPJoxn7JCvAby9szgnt93MSEwdnxdhaASxbTBm6x5dCwmsDep2UYN4FhStDn5i11nsJbpU7oj59ahg8gXb1Mg3viqCuk
+- Viewkey: b1aff2a12191723da0afbe75516f94dd8b068215f6e847d8da57aca5f1f98e0c

app/CMakeLists.txt

@@ -60,84 +60,84 @@ set_target_properties(boost_wserialization PROPERTIES IMPORTED_LOCATION
     ${EXTERNAL_LIBS_DIR}/boost/lib/${ANDROID_ABI}/libboost_wserialization.a)
 
 #############
-# Aeon
+# Monero
 #############
 
 add_library(wallet_api STATIC IMPORTED)
 set_target_properties(wallet_api PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libwallet_api.a)
+    ${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}/aeon/lib/${ANDROID_ABI}/libwallet.a)
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libwallet.a)
 
 add_library(cryptonote_core STATIC IMPORTED)
 set_target_properties(cryptonote_core PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libcryptonote_core.a)
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libcryptonote_core.a)
 
 add_library(cryptonote_basic STATIC IMPORTED)
 set_target_properties(cryptonote_basic PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libcryptonote_basic.a)
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libcryptonote_basic.a)
 
 add_library(mnemonics STATIC IMPORTED)
 set_target_properties(mnemonics PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libmnemonics.a)
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libmnemonics.a)
 
 add_library(common STATIC IMPORTED)
 set_target_properties(common PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libcommon.a)
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libcommon.a)
 
 add_library(cncrypto STATIC IMPORTED)
 set_target_properties(cncrypto PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libcncrypto.a)
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libcncrypto.a)
 
 add_library(ringct STATIC IMPORTED)
 set_target_properties(ringct PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libringct.a)
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libringct.a)
 
 add_library(ringct_basic STATIC IMPORTED)
 set_target_properties(ringct_basic PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libringct_basic.a)
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libringct_basic.a)
 
 add_library(blockchain_db STATIC IMPORTED)
 set_target_properties(blockchain_db PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libblockchain_db.a)
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libblockchain_db.a)
 
 add_library(lmdb STATIC IMPORTED)
 set_target_properties(lmdb PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/liblmdb.a)
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/liblmdb.a)
 
 add_library(easylogging STATIC IMPORTED)
 set_target_properties(easylogging PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libeasylogging.a)
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libeasylogging.a)
 
 add_library(unbound STATIC IMPORTED)
 set_target_properties(unbound PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libunbound.a)
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libunbound.a)
 
 add_library(epee STATIC IMPORTED)
 set_target_properties(epee PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libepee.a)
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libepee.a)
 
 add_library(blocks STATIC IMPORTED)
 set_target_properties(blocks PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libblocks.a)
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libblocks.a)
 
 add_library(checkpoints STATIC IMPORTED)
 set_target_properties(checkpoints PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libcheckpoints.a)
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libcheckpoints.a)
 
 add_library(device STATIC IMPORTED)
 set_target_properties(device PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libdevice.a)
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libdevice.a)
 
 add_library(multisig STATIC IMPORTED)
 set_target_properties(multisig PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libmultisig.a)
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libmultisig.a)
 
 add_library(version STATIC IMPORTED)
 set_target_properties(version PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libversion.a)
+    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libversion.a)
 
 #############
 # System
@@ -145,7 +145,7 @@ set_target_properties(version PROPERTIES IMPORTED_LOCATION
 
 find_library( log-lib log )
 
-include_directories( ${EXTERNAL_LIBS_DIR}/aeon/include )
+include_directories( ${EXTERNAL_LIBS_DIR}/monero/include )
 
 message(STATUS EXTERNAL_LIBS_DIR :  ${EXTERNAL_LIBS_DIR})
 

app/build.gradle

@@ -4,11 +4,11 @@ android {
     compileSdkVersion 25
     buildToolsVersion '27.0.3'
     defaultConfig {
-        applicationId "com.m2049r.aeonwallet"
+        applicationId "com.m2049r.xmrwallet"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 20
+        versionCode 95
-        versionName "0.2.0 'Accounts RC1'"
+        versionName "1.5.5 'Accounts Nacho'"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {

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

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

app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.m2049r.aeonwallet">
+    package="com.m2049r.xmrwallet">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -39,7 +39,7 @@
             android:name=".service.WalletService"
             android:description="@string/service_description"
             android:exported="false"
-            android:label="Wallet Service" />
+            android:label="Monero Wallet Service" />
 
     </application>
 

app/src/main/cpp/monerujo.h

@@ -60,9 +60,14 @@ enum {
     HASH_DATA_AREA = 136
 };
 
-void cn_slow_hash(const void *data, size_t length, char *hash, int light, int variant, int prehashed);
+void cn_slow_hash(const void *data, size_t length, char *hash, int variant, int prehashed);
+
 inline void slow_hash(const void *data, const size_t length, char *hash) {
-    cn_slow_hash(data, length, hash, 0 /*light*/, 0 /* variant */, 0/*prehashed*/);
+    cn_slow_hash(data, length, hash, 0 /* variant */, 0/*prehashed*/);
+}
+
+inline void slow_hash_broken(const void *data, char *hash, int variant) {
+    cn_slow_hash(data, 200 /*sizeof(union hash_state)*/, hash, variant, 1 /*prehashed*/);
 }
 
 #ifdef __cplusplus

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

@@ -1,142 +0,0 @@
-/*
- * Copyright (c) 2017-2018 m2049r et al.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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.aeonwallet.service.exchange.coinmarketcap;
-
-import android.support.annotation.NonNull;
-import android.support.annotation.VisibleForTesting;
-
-import com.m2049r.aeonwallet.service.exchange.api.ExchangeApi;
-import com.m2049r.aeonwallet.service.exchange.api.ExchangeCallback;
-import com.m2049r.aeonwallet.service.exchange.api.ExchangeException;
-import com.m2049r.aeonwallet.service.exchange.api.ExchangeRate;
-import com.m2049r.aeonwallet.util.Helper;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.IOException;
-
-import okhttp3.Call;
-import okhttp3.HttpUrl;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-
-public class ExchangeApiImpl implements ExchangeApi {
-    static final String CRYPTO_ID = "1026";
-
-    @NonNull
-    private final OkHttpClient okHttpClient;
-
-    private final HttpUrl baseUrl;
-
-    //so we can inject the mockserver url
-    @VisibleForTesting
-    ExchangeApiImpl(@NonNull final OkHttpClient okHttpClient, final HttpUrl baseUrl) {
-
-        this.okHttpClient = okHttpClient;
-        this.baseUrl = baseUrl;
-    }
-
-    public ExchangeApiImpl(@NonNull final OkHttpClient okHttpClient) {
-        this(okHttpClient, HttpUrl.parse("https://api.coinmarketcap.com/v2/ticker/"));
-    }
-
-    @Override
-    public void queryExchangeRate(@NonNull final String baseCurrency, @NonNull final String quoteCurrency,
-                                  @NonNull final ExchangeCallback callback) {
-
-        if (baseCurrency.equals(quoteCurrency)) {
-            callback.onSuccess(new ExchangeRateImpl(baseCurrency, quoteCurrency, 1.0));
-            return;
-        }
-
-        boolean inverse = false;
-        String fiat = null;
-
-        if (baseCurrency.equals(Helper.CRYPTO)) {
-            fiat = quoteCurrency;
-            inverse = false;
-        }
-
-        if (quoteCurrency.equals(Helper.CRYPTO)) {
-            fiat = baseCurrency;
-            inverse = true;
-        }
-
-        if (fiat == null) {
-            callback.onError(new IllegalArgumentException("no fiat specified"));
-            return;
-        }
-
-        final boolean swapAssets = inverse;
-
-        final HttpUrl url = baseUrl.newBuilder()
-                .addEncodedPathSegments(CRYPTO_ID + "/")
-                .addQueryParameter("convert", fiat)
-                .build();
-
-        final Request httpRequest = createHttpRequest(url);
-
-        okHttpClient.newCall(httpRequest).enqueue(new okhttp3.Callback() {
-            @Override
-            public void onFailure(final Call call, final IOException ex) {
-                callback.onError(ex);
-            }
-
-            @Override
-            public void onResponse(final Call call, final Response response) throws IOException {
-                if (response.isSuccessful()) {
-                    try {
-                        final JSONObject json = new JSONObject(response.body().string());
-                        final JSONObject metadata = json.getJSONObject("metadata");
-                        if (!metadata.isNull("error")) {
-                            final String errorMsg = metadata.getString("error");
-                            callback.onError(new ExchangeException(response.code(), (String) errorMsg));
-                        } else {
-                            final JSONObject jsonResult = json.getJSONObject("data");
-                            reportSuccess(jsonResult, swapAssets, callback);
-                        }
-                    } catch (JSONException ex) {
-                        callback.onError(new ExchangeException(ex.getLocalizedMessage()));
-                    }
-                } else {
-                    callback.onError(new ExchangeException(response.code(), response.message()));
-                }
-            }
-        });
-    }
-
-    void reportSuccess(JSONObject jsonObject, boolean swapAssets, ExchangeCallback callback) {
-        try {
-            final ExchangeRate exchangeRate = new ExchangeRateImpl(jsonObject, swapAssets);
-            callback.onSuccess(exchangeRate);
-        } catch (JSONException ex) {
-            callback.onError(new ExchangeException(ex.getLocalizedMessage()));
-        } catch (ExchangeException ex) {
-            callback.onError(ex);
-        }
-    }
-
-    private Request createHttpRequest(final HttpUrl url) {
-        return new Request.Builder()
-                .url(url)
-                .get()
-                .build();
-    }
-}

app/src/main/java/com/m2049r/aeonwallet/util/UserNotes.java

@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 m2049r
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.m2049r.aeonwallet.util;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class UserNotes {
-    public String txNotes = "";
-    public String note = "";
-
-    public UserNotes(final String txNotes) {
-        if (txNotes == null) {
-            return;
-        }
-        this.txNotes = txNotes;
-        note = txNotes;
-    }
-
-    public void setNote(String newNote) {
-        if (newNote != null) {
-            note = newNote;
-        } else {
-            note = "";
-        }
-        txNotes = buildTxNote();
-    }
-
-    private String buildTxNote() {
-        return note;
-    }
-}

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.m2049r.aeonwallet;
+package com.m2049r.xmrwallet;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -39,13 +39,13 @@ import android.widget.LinearLayout;
 import android.widget.Switch;
 import android.widget.TextView;
 
-import com.m2049r.aeonwallet.model.Wallet;
+import com.m2049r.xmrwallet.model.Wallet;
-import com.m2049r.aeonwallet.model.WalletManager;
+import com.m2049r.xmrwallet.model.WalletManager;
-import com.m2049r.aeonwallet.util.FingerprintHelper;
+import com.m2049r.xmrwallet.util.FingerprintHelper;
-import com.m2049r.aeonwallet.util.Helper;
+import com.m2049r.xmrwallet.util.Helper;
-import com.m2049r.aeonwallet.util.KeyStoreHelper;
+import com.m2049r.xmrwallet.util.KeyStoreHelper;
-import com.m2049r.aeonwallet.util.RestoreHeight;
+import com.m2049r.xmrwallet.util.RestoreHeight;
-import com.m2049r.aeonwallet.widget.Toolbar;
+import com.m2049r.xmrwallet.widget.Toolbar;
 import com.nulabinc.zxcvbn.Strength;
 import com.nulabinc.zxcvbn.Zxcvbn;
 
@@ -407,8 +407,7 @@ public class GenerateFragment extends Fragment {
 
     private boolean checkMnemonic() {
         String seed = etWalletMnemonic.getEditText().getText().toString();
-        int seedWords = seed.split("\\s").length;
+        boolean ok = (seed.split("\\s").length == 25); // 25 words
-        boolean ok = ((seedWords == 25) || (seedWords == 24)); // 24 are old style
         if (!ok) {
             etWalletMnemonic.setError(getString(R.string.generate_check_mnemonic));
         } else {

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.m2049r.aeonwallet;
+package com.m2049r.xmrwallet;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -43,14 +43,14 @@ import android.widget.Switch;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.m2049r.aeonwallet.model.NetworkType;
+import com.m2049r.xmrwallet.model.NetworkType;
-import com.m2049r.aeonwallet.model.Wallet;
+import com.m2049r.xmrwallet.model.Wallet;
-import com.m2049r.aeonwallet.model.WalletManager;
+import com.m2049r.xmrwallet.model.WalletManager;
-import com.m2049r.aeonwallet.util.FingerprintHelper;
+import com.m2049r.xmrwallet.util.FingerprintHelper;
-import com.m2049r.aeonwallet.util.Helper;
+import com.m2049r.xmrwallet.util.Helper;
-import com.m2049r.aeonwallet.util.KeyStoreHelper;
+import com.m2049r.xmrwallet.util.KeyStoreHelper;
-import com.m2049r.aeonwallet.util.MoneroThreadPoolExecutor;
+import com.m2049r.xmrwallet.util.MoneroThreadPoolExecutor;
-import com.m2049r.aeonwallet.widget.Toolbar;
+import com.m2049r.xmrwallet.widget.Toolbar;
 
 import java.io.File;
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.m2049r.aeonwallet;
+package com.m2049r.xmrwallet;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -41,19 +41,19 @@ import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.m2049r.aeonwallet.data.WalletNode;
+import com.m2049r.xmrwallet.data.WalletNode;
-import com.m2049r.aeonwallet.dialog.AboutFragment;
+import com.m2049r.xmrwallet.dialog.AboutFragment;
-import com.m2049r.aeonwallet.dialog.CreditsFragment;
+import com.m2049r.xmrwallet.dialog.CreditsFragment;
-import com.m2049r.aeonwallet.dialog.HelpFragment;
+import com.m2049r.xmrwallet.dialog.HelpFragment;
-import com.m2049r.aeonwallet.dialog.PrivacyFragment;
+import com.m2049r.xmrwallet.dialog.PrivacyFragment;
-import com.m2049r.aeonwallet.model.NetworkType;
+import com.m2049r.xmrwallet.model.NetworkType;
-import com.m2049r.aeonwallet.model.Wallet;
+import com.m2049r.xmrwallet.model.Wallet;
-import com.m2049r.aeonwallet.model.WalletManager;
+import com.m2049r.xmrwallet.model.WalletManager;
-import com.m2049r.aeonwallet.service.WalletService;
+import com.m2049r.xmrwallet.service.WalletService;
-import com.m2049r.aeonwallet.util.Helper;
+import com.m2049r.xmrwallet.util.Helper;
-import com.m2049r.aeonwallet.util.KeyStoreHelper;
+import com.m2049r.xmrwallet.util.KeyStoreHelper;
-import com.m2049r.aeonwallet.util.MoneroThreadPoolExecutor;
+import com.m2049r.xmrwallet.util.MoneroThreadPoolExecutor;
-import com.m2049r.aeonwallet.widget.Toolbar;
+import com.m2049r.xmrwallet.widget.Toolbar;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -494,11 +494,11 @@ public class LoginActivity extends SecureActivity
                 break;
             case NetworkType_Testnet:
                 toolbar.setSubtitle(getString(R.string.connect_testnet));
-                toolbar.setBackgroundResource(R.color.give);
+                toolbar.setBackgroundResource(R.color.colorPrimaryDark);
                 break;
             case NetworkType_Stagenet:
                 toolbar.setSubtitle(getString(R.string.connect_stagenet));
-                toolbar.setBackgroundResource(R.color.give);
+                toolbar.setBackgroundResource(R.color.colorPrimaryDark);
                 break;
             default:
                 throw new IllegalStateException("NetworkType unknown: " + WalletManager.getInstance().getNetworkType());

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.m2049r.aeonwallet;
+package com.m2049r.xmrwallet;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -43,15 +43,15 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.m2049r.aeonwallet.layout.WalletInfoAdapter;
+import com.m2049r.xmrwallet.layout.WalletInfoAdapter;
-import com.m2049r.aeonwallet.model.NetworkType;
+import com.m2049r.xmrwallet.model.NetworkType;
-import com.m2049r.aeonwallet.model.WalletManager;
+import com.m2049r.xmrwallet.model.WalletManager;
-import com.m2049r.aeonwallet.util.Helper;
+import com.m2049r.xmrwallet.util.Helper;
-import com.m2049r.aeonwallet.util.KeyStoreHelper;
+import com.m2049r.xmrwallet.util.KeyStoreHelper;
-import com.m2049r.aeonwallet.util.NodeList;
+import com.m2049r.xmrwallet.util.NodeList;
-import com.m2049r.aeonwallet.util.Notice;
+import com.m2049r.xmrwallet.util.Notice;
-import com.m2049r.aeonwallet.widget.DropDownEditText;
+import com.m2049r.xmrwallet.widget.DropDownEditText;
-import com.m2049r.aeonwallet.widget.Toolbar;
+import com.m2049r.xmrwallet.widget.Toolbar;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -266,11 +266,11 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
     private String addressPrefix() {
         switch (WalletManager.getInstance().getNetworkType()) {
             case NetworkType_Testnet:
-                return "-"; // no idea
+                return "9A-";
             case NetworkType_Mainnet:
-                return "W-"; // guess
+                return "4-";
             case NetworkType_Stagenet:
-                return "S-"; // guess
+                return "5-";
             default:
                 throw new IllegalStateException("Unsupported Network: " + WalletManager.getInstance().getNetworkType());
         }
@@ -368,9 +368,11 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
     private static final String PREF_DAEMON_STAGENET = "daemon_stagenet";
     private static final String PREF_DAEMON_MAINNET = "daemon_mainnet";
 
-    private static final String PREF_DAEMONLIST_MAINNET = "aeon.monerujo.io";
+    private static final String PREF_DAEMONLIST_MAINNET =
+            "node.moneroworld.com:18089;node.xmrbackb.one;node.xmr.be";
 
-    private static final String PREF_DAEMONLIST_STAGENET = "aeon.monerujo.io";
+    private static final String PREF_DAEMONLIST_STAGENET =
+            "stagenet.xmr-tw.org";
 
     private NodeList daemonStageNet;
     private NodeList daemonMainNet;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.m2049r.aeonwallet;
+package com.m2049r.xmrwallet;
 
 public interface OnBackPressedListener {
     boolean onBackPressed();

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.m2049r.aeonwallet;
+package com.m2049r.xmrwallet;
 
 import android.content.Context;
 import android.os.Bundle;

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

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.m2049r.aeonwallet;
+package com.m2049r.xmrwallet;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 
-import com.m2049r.aeonwallet.util.Helper;
+import com.m2049r.xmrwallet.util.Helper;
 
 import java.io.File;
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.m2049r.aeonwallet;
+package com.m2049r.xmrwallet;
 
 import android.content.Context;
 import android.content.Intent;
@@ -30,12 +30,14 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
+import android.widget.Toast;
 
-import com.m2049r.aeonwallet.model.TransactionInfo;
+import com.m2049r.xmrwallet.model.TransactionInfo;
-import com.m2049r.aeonwallet.model.Transfer;
+import com.m2049r.xmrwallet.model.Transfer;
-import com.m2049r.aeonwallet.model.Wallet;
+import com.m2049r.xmrwallet.model.Wallet;
-import com.m2049r.aeonwallet.util.UserNotes;
+import com.m2049r.xmrwallet.util.Helper;
-import com.m2049r.aeonwallet.widget.Toolbar;
+import com.m2049r.xmrwallet.util.UserNotes;
+import com.m2049r.xmrwallet.widget.Toolbar;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -70,12 +72,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);
+
         tvAccount = (TextView) view.findViewById(R.id.tvAccount);
         tvTxTimestamp = (TextView) view.findViewById(R.id.tvTxTimestamp);
         tvTxId = (TextView) view.findViewById(R.id.tvTxId);
@@ -102,6 +115,14 @@ public class TxFragment extends Fragment {
             }
         });
 
+        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();
+            }
+        });
+
         Bundle args = getArguments();
         TransactionInfo info = args.getParcelable(ARG_INFO);
         show(info);
@@ -203,7 +224,7 @@ public class TxFragment extends Fragment {
         activityCallback.setSubtitle(getString(R.string.tx_title));
         activityCallback.setToolbarButton(Toolbar.BUTTON_BACK);
 
-        tvAccount.setText(getString(R.string.tx_account_formatted, info.account, info.subaddress));
+        tvAccount.setText("" + info.subaddrAccount);
 
         tvTxTimestamp.setText(TS_FORMATTER.format(new Date(info.timestamp * 1000)));
         tvTxId.setText(info.hash);
@@ -266,16 +287,26 @@ public class TxFragment extends Fragment {
             }
         } else {
             sb.append("-");
-            dstSb.append(info.direction ==
+            dstSb.append(info.direction == TransactionInfo.Direction.Direction_In ? activityCallback.getWalletAddress() : "-");
-                    TransactionInfo.Direction.Direction_In ?
-                    activityCallback.getWalletSubaddress(info.account, info.subaddress) :
-                    "-");
         }
         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);
@@ -291,7 +322,7 @@ public class TxFragment extends Fragment {
     Listener activityCallback;
 
     public interface Listener {
-        String getWalletSubaddress(int accountIndex, int subaddressIndex);
+        String getWalletAddress();
 
         String getTxKey(String hash);
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.m2049r.aeonwallet;
+package com.m2049r.xmrwallet;
 
 import android.app.AlertDialog;
 import android.content.ComponentName;
@@ -45,20 +45,20 @@ import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.m2049r.aeonwallet.data.BarcodeData;
+import com.m2049r.xmrwallet.data.BarcodeData;
-import com.m2049r.aeonwallet.data.TxData;
+import com.m2049r.xmrwallet.data.TxData;
-import com.m2049r.aeonwallet.dialog.CreditsFragment;
+import com.m2049r.xmrwallet.dialog.CreditsFragment;
-import com.m2049r.aeonwallet.dialog.HelpFragment;
+import com.m2049r.xmrwallet.dialog.HelpFragment;
-import com.m2049r.aeonwallet.fragment.send.SendAddressWizardFragment;
+import com.m2049r.xmrwallet.fragment.send.SendAddressWizardFragment;
-import com.m2049r.aeonwallet.fragment.send.SendFragment;
+import com.m2049r.xmrwallet.fragment.send.SendFragment;
-import com.m2049r.aeonwallet.model.PendingTransaction;
+import com.m2049r.xmrwallet.model.PendingTransaction;
-import com.m2049r.aeonwallet.model.TransactionInfo;
+import com.m2049r.xmrwallet.model.TransactionInfo;
-import com.m2049r.aeonwallet.model.Wallet;
+import com.m2049r.xmrwallet.model.Wallet;
-import com.m2049r.aeonwallet.model.WalletManager;
+import com.m2049r.xmrwallet.model.WalletManager;
-import com.m2049r.aeonwallet.service.WalletService;
+import com.m2049r.xmrwallet.service.WalletService;
-import com.m2049r.aeonwallet.util.Helper;
+import com.m2049r.xmrwallet.util.Helper;
-import com.m2049r.aeonwallet.util.UserNotes;
+import com.m2049r.xmrwallet.util.UserNotes;
-import com.m2049r.aeonwallet.widget.Toolbar;
+import com.m2049r.xmrwallet.widget.Toolbar;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -179,7 +179,7 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
             saveWallet();
         }
         stopWalletService();
-        if (drawer != null) drawer.removeDrawerListener(drawerToggle);
+        drawer.removeDrawerListener(drawerToggle);
         super.onDestroy();
     }
 
@@ -286,7 +286,8 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
         });
 
         drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
-        drawerToggle = new ActionBarDrawerToggle(this, drawer, toolbar, 0, 0);
+        drawerToggle = new ActionBarDrawerToggle(this, drawer, toolbar,
+                R.string.accounts_drawer_open, R.string.accounts_drawer_close);
         drawer.addDrawerListener(drawerToggle);
         drawerToggle.syncState();
         setDrawerEnabled(false); // disable until synced
@@ -311,10 +312,10 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
                 toolbar.setBackgroundResource(R.drawable.backgound_toolbar_mainnet);
                 break;
             case NetworkType_Testnet:
-                toolbar.setBackgroundResource(R.color.give);
+                toolbar.setBackgroundResource(R.color.colorPrimaryDark);
                 break;
             case NetworkType_Stagenet:
-                toolbar.setBackgroundResource(R.color.give);
+                toolbar.setBackgroundResource(R.color.colorPrimaryDark);
                 break;
             default:
                 throw new IllegalStateException("Unsupported Network: " + WalletManager.getInstance().getNetworkType());
@@ -490,8 +491,8 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
     @Override
     public boolean onRefreshed(final Wallet wallet, final boolean full) {
         Timber.d("onRefreshed()");
-        if (numAccounts != wallet.getNumAccounts()) {
+        if (numAccounts != wallet.numAccounts()) {
-            numAccounts = wallet.getNumAccounts();
+            numAccounts = wallet.numAccounts();
             runOnUiThread(new Runnable() {
                 public void run() {
                     updateAccountsList();
@@ -739,8 +740,8 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
     }
 
     @Override
-    public String getWalletSubaddress(int accountIndex, int subaddressIndex) {
+    public String getWalletAddress() {
-        return getWallet().getSubaddress(accountIndex, subaddressIndex);
+        return getWallet().getAddress();
     }
 
     public String getWalletName() {
@@ -890,7 +891,7 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
 
     @Override
     public void onWalletReceive() {
-        startReceive(getWallet().getAddress());
+        startReceive(getWalletAddress());
     }
 
     void startReceive(String address) {
@@ -965,8 +966,7 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
                 Helper.getDisplayAmount(wallet.getBalanceAll(), 5)));
         Menu menu = accountsView.getMenu();
         menu.removeGroup(R.id.accounts_list);
-        final int n = wallet.getNumAccounts();
+        for (int i = 0; i < wallet.numAccounts(); i++) {
-        for (int i = 0; i < n; i++) {
             final String label = wallet.getAccountLabel(i);
             final MenuItem item = menu.add(R.id.accounts_list, getAccountId(i), 2 * i, label);
             item.setIcon(R.drawable.ic_account_balance_wallet_black_24dp);
@@ -1050,7 +1050,7 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
         switch (id) {
             case R.id.account_new:
                 getWallet().addAccount();
-                int newIdx = getWallet().getNumAccounts() - 1;
+                int newIdx = getWallet().numAccounts() - 1;
                 getWallet().setAccountIndex(newIdx);
                 Toast.makeText(this,
                         getString(R.string.accounts_new, newIdx),

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.m2049r.aeonwallet;
+package com.m2049r.xmrwallet;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -37,14 +37,14 @@ import android.widget.ProgressBar;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import com.m2049r.aeonwallet.layout.TransactionInfoAdapter;
+import com.m2049r.xmrwallet.layout.TransactionInfoAdapter;
-import com.m2049r.aeonwallet.model.TransactionInfo;
+import com.m2049r.xmrwallet.model.TransactionInfo;
-import com.m2049r.aeonwallet.model.Wallet;
+import com.m2049r.xmrwallet.model.Wallet;
-import com.m2049r.aeonwallet.service.exchange.api.ExchangeApi;
+import com.m2049r.xmrwallet.service.exchange.api.ExchangeApi;
-import com.m2049r.aeonwallet.service.exchange.api.ExchangeCallback;
+import com.m2049r.xmrwallet.service.exchange.api.ExchangeCallback;
-import com.m2049r.aeonwallet.service.exchange.api.ExchangeRate;
+import com.m2049r.xmrwallet.service.exchange.api.ExchangeRate;
-import com.m2049r.aeonwallet.util.Helper;
+import com.m2049r.xmrwallet.util.Helper;
-import com.m2049r.aeonwallet.widget.Toolbar;
+import com.m2049r.xmrwallet.widget.Toolbar;
 
 import java.text.NumberFormat;
 import java.util.List;
@@ -230,7 +230,7 @@ public class WalletFragment extends Fragment
     public void exchange(final ExchangeRate exchangeRate) {
         hideExchanging();
         if (!Helper.CRYPTO.equals(exchangeRate.getBaseCurrency())) {
-            Timber.e("Not AEON");
+            Timber.e("Not XMR");
             sCurrency.setSelection(0, true);
             balanceCurrency = Helper.CRYPTO;
             balanceRate = 1.0;
@@ -422,7 +422,6 @@ public class WalletFragment extends Fragment
         setProgress(syncProgress);
         setProgress(syncText);
         showReceive();
-        if (activityCallback.isSynced()) enableAccountsList(true);
     }
 
     @Override

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

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.m2049r.aeonwallet;
+package com.m2049r.xmrwallet;
 
 
 import android.app.Application;
 
-import com.m2049r.aeonwallet.util.Helper;
+import com.m2049r.xmrwallet.util.Helper;
 
 import timber.log.Timber;
 

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

@@ -14,11 +14,14 @@
  * limitations under the License.
  */
 
-package com.m2049r.aeonwallet.data;
+package com.m2049r.xmrwallet.data;
 
 import android.net.Uri;
 
-import com.m2049r.aeonwallet.model.Wallet;
+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;
@@ -26,12 +29,15 @@ import java.util.Map;
 import timber.log.Timber;
 
 public class BarcodeData {
-    public static final String XMR_SCHEME = "aeon:";
+    public static final String XMR_SCHEME = "monero:";
     public static final String XMR_PAYMENTID = "tx_payment_id";
     public static final String XMR_AMOUNT = "tx_amount";
 
+    static final String BTC_SCHEME = "bitcoin:";
+    static final String BTC_AMOUNT = "amount";
+
     public enum Asset {
-        XMR
+        XMR, BTC
     }
 
     public Asset asset = null;
@@ -64,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;
     }
 
@@ -131,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/PendingTx.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.m2049r.aeonwallet.data;
+package com.m2049r.xmrwallet.data;
 
-import com.m2049r.aeonwallet.model.PendingTransaction;
+import com.m2049r.xmrwallet.model.PendingTransaction;
 
 public class PendingTx {
     final public PendingTransaction.Status status;

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

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.m2049r.aeonwallet.data;
+package com.m2049r.xmrwallet.data;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.m2049r.aeonwallet.model.PendingTransaction;
+import com.m2049r.xmrwallet.model.PendingTransaction;
-import com.m2049r.aeonwallet.util.UserNotes;
+import com.m2049r.xmrwallet.util.UserNotes;
 
 import timber.log.Timber;
 

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

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.m2049r.aeonwallet.data;
+package com.m2049r.xmrwallet.data;
 
-import com.m2049r.aeonwallet.model.NetworkType;
+import com.m2049r.xmrwallet.model.NetworkType;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
@@ -67,13 +67,13 @@ public class WalletNode {
         } else {
             switch (networkType) {
                 case NetworkType_Mainnet:
-                    port = 11181;
+                    port = 18081;
                     break;
                 case NetworkType_Testnet:
-                    port = 21181;
+                    port = 28081;
                     break;
                 case NetworkType_Stagenet:
-                    port = 31181;
+                    port = 38081;
                     break;
                 default:
                     port = 0;