AEON (#1 )

2025-09-05 09:58:42 +02:00 · 2018-06-04 21:52:04 +02:00
229 changed files with 1698 additions and 14093 deletions
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -1,3 +0,0 @@
-workspace.xml
-markdown-*
-misc.xml
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +0,0 @@
-xmrwallet
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,22 +0,0 @@
-<?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>
--- a/.idea/copyright/profiles_settings.xml
+++ b/.idea/copyright/profiles_settings.xml
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
--- a/.idea/modules.xml
+++ b/.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>
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Another Android Monero Wallet for Monero
    Monero V)**

 ### QUICKSTART
- Download the APK for the most current release [here](https://github.com/m2049r/xmrwallet/releases) and install it
+- Download the APK for the most current release [here](https://github.com/monerujo-io/aeonwallet/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)
--- a/app/CMakeLists.txt
+++ b/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)

 #############
-# Monero
+# Aeon
 #############

 add_library(wallet_api STATIC IMPORTED)
 set_target_properties(wallet_api PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libwallet_api.a)
+    ${EXTERNAL_LIBS_DIR}/aeon/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)
+    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libwallet.a)

 add_library(cryptonote_core STATIC IMPORTED)
 set_target_properties(cryptonote_core PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libcryptonote_core.a)
+    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libcryptonote_core.a)

 add_library(cryptonote_basic STATIC IMPORTED)
 set_target_properties(cryptonote_basic PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libcryptonote_basic.a)
+    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libcryptonote_basic.a)

 add_library(mnemonics STATIC IMPORTED)
 set_target_properties(mnemonics PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libmnemonics.a)
+    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libmnemonics.a)

 add_library(common STATIC IMPORTED)
 set_target_properties(common PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libcommon.a)
+    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libcommon.a)

 add_library(cncrypto STATIC IMPORTED)
 set_target_properties(cncrypto PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libcncrypto.a)
+    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libcncrypto.a)

 add_library(ringct STATIC IMPORTED)
 set_target_properties(ringct PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libringct.a)
+    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libringct.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)
+    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libringct_basic.a)

 add_library(blockchain_db STATIC IMPORTED)
 set_target_properties(blockchain_db PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libblockchain_db.a)
+    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libblockchain_db.a)

 add_library(lmdb STATIC IMPORTED)
 set_target_properties(lmdb PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/liblmdb.a)
+    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/liblmdb.a)

 add_library(easylogging STATIC IMPORTED)
 set_target_properties(easylogging PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libeasylogging.a)
+    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libeasylogging.a)

 add_library(unbound STATIC IMPORTED)
 set_target_properties(unbound PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libunbound.a)
+    ${EXTERNAL_LIBS_DIR}/aeon/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)
+    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libepee.a)

 add_library(blocks STATIC IMPORTED)
 set_target_properties(blocks PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libblocks.a)
+    ${EXTERNAL_LIBS_DIR}/aeon/lib/${ANDROID_ABI}/libblocks.a)

 add_library(checkpoints STATIC IMPORTED)
 set_target_properties(checkpoints PROPERTIES IMPORTED_LOCATION
-    ${EXTERNAL_LIBS_DIR}/monero/lib/${ANDROID_ABI}/libcheckpoints.a)
+    ${EXTERNAL_LIBS_DIR}/aeon/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)
+    ${EXTERNAL_LIBS_DIR}/aeon/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)
+    ${EXTERNAL_LIBS_DIR}/aeon/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)
+    ${EXTERNAL_LIBS_DIR}/aeon/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}/monero/include )
+include_directories( ${EXTERNAL_LIBS_DIR}/aeon/include )

 message(STATUS EXTERNAL_LIBS_DIR :  ${EXTERNAL_LIBS_DIR})

--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'

 android {
-    compileSdkVersion 27
-    buildToolsVersion '28.0.2'
+    compileSdkVersion 25
+    buildToolsVersion '27.0.3'
    defaultConfig {
-        applicationId "com.m2049r.xmrwallet"
+        applicationId "com.m2049r.aeonwallet"
        minSdkVersion 21
-        targetSdkVersion 27
-        versionCode 114
-        versionName "1.6.4 'Nano S'"
+        targetSdkVersion 25
+        versionCode 10
+        versionName "0.1.0 'Rebase ALPHA'"
        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
        externalNativeBuild {
            cmake {
@@ -45,17 +45,8 @@ android {
    // Map for the version code that gives each ABI a value.
    def abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, 'x86': 3, 'x86_64': 4]

-    // Enumerate translated locales
-    def availableLocales = ["en"]
-    new File("app/src/main/res/").eachFileMatch(~/^values-.*/) { file ->
-        def languageTag = file.name.substring(7).replace("-r", "-")
-        availableLocales.add(languageTag)
-    }
-
    // APKs for the same app that all have the same version information.
    android.applicationVariants.all { variant ->
-        // Update string resource: available_locales
-        variant.resValue("string", "available_locales", availableLocales.join(","))
        // Assigns a different version code for each output APK.
        variant.outputs.all {
            output ->
@@ -70,11 +61,11 @@ android {
 }

 dependencies {
-    implementation "com.android.support:appcompat-v7:$rootProject.ext.supportVersion"
-    implementation "com.android.support:design:$rootProject.ext.supportVersion"
-    implementation "com.android.support:support-v4:$rootProject.ext.supportVersion"
-    implementation "com.android.support:recyclerview-v7:$rootProject.ext.supportVersion"
-    implementation "com.android.support:cardview-v7:$rootProject.ext.supportVersion"
+    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 'me.dm7.barcodescanner:zxing:1.9.8'

    implementation "com.squareup.okhttp3:okhttp:$rootProject.ext.okHttpVersion"
--- a/app/src/debug/res/values/strings.xml
+++ b/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">monerujo - Debug</string>
+    <string name="app_name" translatable="false">monerujoAE</string>
 </resources>
--- a/app/src/main/AndroidManifest.xml
+++ b/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.xmrwallet">
+    package="com.m2049r.aeonwallet">

    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -8,14 +8,13 @@
    <uses-permission android:name="android.permission.WAKE_LOCK" />
    <uses-permission android:name="android.permission.CAMERA" />
    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
-    <uses-permission android:name="android.permission.NFC" />

    <application
-        android:name=".XmrWalletApplication"
-        android:allowBackup="false"
+        android:allowBackup="true"
        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
        android:supportsRtl="true"
+        android:name=".XmrWalletApplication"
        android:theme="@style/MyMaterialTheme">

        <activity
@@ -29,25 +28,19 @@
            android:name=".LoginActivity"
            android:configChanges="orientation|keyboardHidden"
            android:label="@string/app_name"
-            android:launchMode="singleTop"
            android:screenOrientation="portrait">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
-            <intent-filter>
-                <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
-                android:resource="@xml/usb_device_filter" />
        </activity>
-        
+
        <service
            android:name=".service.WalletService"
            android:description="@string/service_description"
            android:exported="false"
-            android:label="Monero Wallet Service" />
+            android:label="Wallet Service" />
+
    </application>
+
 </manifest>
--- a/app/src/main/cpp/monerujo.cpp
+++ b/app/src/main/cpp/monerujo.cpp
--- a/app/src/main/cpp/monerujo.h
+++ b/app/src/main/cpp/monerujo.h
@@ -60,14 +60,9 @@ enum {
    HASH_DATA_AREA = 136
 };

-void cn_slow_hash(const void *data, size_t length, char *hash, int variant, int prehashed);
-
+void cn_slow_hash(const void *data, size_t length, char *hash, int light, int variant, int prehashed);
 inline void slow_hash(const void *data, const size_t length, char *hash) {
-    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*/);
+    cn_slow_hash(data, length, hash, 0 /*light*/, 0 /* variant */, 0/*prehashed*/);
 }

 #ifdef __cplusplus
--- a/app/src/main/cpp/monerujo_ledger.h
+++ b/app/src/main/cpp/monerujo_ledger.h
@@ -1,46 +0,0 @@
-/**
- * Copyright (c) 2018 m2049r
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef XMRWALLET_LEDGER_H
-#define XMRWALLET_LEDGER_H
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#define SCARD_S_SUCCESS ((LONG)0x00000000) /**< No error was encountered. */
-#define SCARD_E_INSUFFICIENT_BUFFER    ((LONG)0x80100008) /**< The data buffer to receive returned data is too small for the returned data. */
-#define SCARD_E_NO_READERS_AVAILABLE ((LONG)0x8010002E) /**< Cannot find a smart card reader. */
-
-typedef long LONG;
-typedef unsigned long DWORD;
-typedef DWORD *LPDWORD;
-typedef unsigned char BYTE;
-typedef BYTE *LPBYTE;
-typedef const BYTE *LPCBYTE;
-
-typedef char CHAR;
-typedef CHAR *LPSTR;
-
-int LedgerFind(char *buffer, size_t len);
-LONG LedgerExchange(LPCBYTE pbSendBuffer, DWORD cbSendLength, LPBYTE pbRecvBuffer, LPDWORD pcbRecvLength);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif //XMRWALLET_LEDGER_H
--- a/app/src/main/ic_launcher-web.png
+++ b/app/src/main/ic_launcher-web.png
--- a/app/src/main/java/com/btchip/BTChipException.java
+++ b/app/src/main/java/com/btchip/BTChipException.java
@@ -1,53 +0,0 @@
-/*
- *******************************************************************************
- *   BTChip Bitcoin Hardware Wallet Java API
- *   (c) 2014 BTChip - 1BTChip7VfTnrPra5jqci7ejnMguuHogTn
- *
- *  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.btchip;
-
-public class BTChipException extends Exception {
-
-    private static final long serialVersionUID = 5512803003827126405L;
-
-    public BTChipException(String reason) {
-        super(reason);
-    }
-
-    public BTChipException(String reason, Throwable cause) {
-        super(reason, cause);
-    }
-
-    public BTChipException(String reason, int sw) {
-        super(reason);
-        this.sw = sw;
-    }
-
-    public int getSW() {
-        return sw;
-    }
-
-    public String toString() {
-        if (sw == 0) {
-            return "BTChip Exception : " + getMessage();
-        } else {
-            return "BTChip Exception : " + getMessage() + " " + Integer.toHexString(sw);
-        }
-    }
-
-    private int sw;
-
-}
--- a/app/src/main/java/com/btchip/comm/BTChipTransport.java
+++ b/app/src/main/java/com/btchip/comm/BTChipTransport.java
@@ -1,31 +0,0 @@
-/*
- *******************************************************************************
- *   BTChip Bitcoin Hardware Wallet Java API
- *   (c) 2014 BTChip - 1BTChip7VfTnrPra5jqci7ejnMguuHogTn
- *   (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.btchip.comm;
-
-import com.btchip.BTChipException;
-
-public interface BTChipTransport {
-    public byte[] exchange(byte[] command);
-
-    public void close();
-
-    public void setDebug(boolean debugFlag);
-}
--- a/app/src/main/java/com/btchip/comm/LedgerHelper.java
+++ b/app/src/main/java/com/btchip/comm/LedgerHelper.java
@@ -1,126 +0,0 @@
-/*
- *******************************************************************************
- *   BTChip Bitcoin Hardware Wallet Java API
- *   (c) 2014 BTChip - 1BTChip7VfTnrPra5jqci7ejnMguuHogTn
- *   (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.btchip.comm;
-
-import java.io.ByteArrayOutputStream;
-
-public class LedgerHelper {
-
-    private static final int TAG_APDU = 0x05;
-
-    public static byte[] wrapCommandAPDU(int channel, byte[] command, int packetSize) {
-        ByteArrayOutputStream output = new ByteArrayOutputStream();
-        if (packetSize < 3) {
-            throw new IllegalArgumentException("Can't handle Ledger framing with less than 3 bytes for the report");
-        }
-        int sequenceIdx = 0;
-        int offset = 0;
-        output.write(channel >> 8);
-        output.write(channel);
-        output.write(TAG_APDU);
-        output.write(sequenceIdx >> 8);
-        output.write(sequenceIdx);
-        sequenceIdx++;
-        output.write(command.length >> 8);
-        output.write(command.length);
-        int blockSize = (command.length > packetSize - 7 ? packetSize - 7 : command.length);
-        output.write(command, offset, blockSize);
-        offset += blockSize;
-        while (offset != command.length) {
-            output.write(channel >> 8);
-            output.write(channel);
-            output.write(TAG_APDU);
-            output.write(sequenceIdx >> 8);
-            output.write(sequenceIdx);
-            sequenceIdx++;
-            blockSize = (command.length - offset > packetSize - 5 ? packetSize - 5 : command.length - offset);
-            output.write(command, offset, blockSize);
-            offset += blockSize;
-        }
-        if ((output.size() % packetSize) != 0) {
-            byte[] padding = new byte[packetSize - (output.size() % packetSize)];
-            output.write(padding, 0, padding.length);
-        }
-        return output.toByteArray();
-    }
-
-    public static byte[] unwrapResponseAPDU(int channel, byte[] data, int packetSize) {
-        ByteArrayOutputStream response = new ByteArrayOutputStream();
-        int offset = 0;
-        int responseLength;
-        int sequenceIdx = 0;
-        if ((data == null) || (data.length < 7 + 5)) {
-            return null;
-        }
-        if (data[offset++] != (channel >> 8)) {
-            throw new IllegalArgumentException("Invalid channel");
-        }
-        if (data[offset++] != (channel & 0xff)) {
-            throw new IllegalArgumentException("Invalid channel");
-        }
-        if (data[offset++] != TAG_APDU) {
-            throw new IllegalArgumentException("Invalid tag");
-        }
-        if (data[offset++] != 0x00) {
-            throw new IllegalArgumentException("Invalid sequence");
-        }
-        if (data[offset++] != 0x00) {
-            throw new IllegalArgumentException("Invalid sequence");
-        }
-        responseLength = ((data[offset++] & 0xff) << 8);
-        responseLength |= (data[offset++] & 0xff);
-        if (data.length < 7 + responseLength) {
-            return null;
-        }
-        int blockSize = (responseLength > packetSize - 7 ? packetSize - 7 : responseLength);
-        response.write(data, offset, blockSize);
-        offset += blockSize;
-        while (response.size() != responseLength) {
-            sequenceIdx++;
-            if (offset == data.length) {
-                return null;
-            }
-            if (data[offset++] != (channel >> 8)) {
-                throw new IllegalArgumentException("Invalid channel");
-            }
-            if (data[offset++] != (channel & 0xff)) {
-                throw new IllegalArgumentException("Invalid channel");
-            }
-            if (data[offset++] != TAG_APDU) {
-                throw new IllegalArgumentException("Invalid tag");
-            }
-            if (data[offset++] != (sequenceIdx >> 8)) {
-                throw new IllegalArgumentException("Invalid sequence");
-            }
-            if (data[offset++] != (sequenceIdx & 0xff)) {
-                throw new IllegalArgumentException("Invalid sequence");
-            }
-            blockSize = (responseLength - response.size() > packetSize - 5 ? packetSize - 5 : responseLength - response.size());
-            if (blockSize > data.length - offset) {
-                return null;
-            }
-            response.write(data, offset, blockSize);
-            offset += blockSize;
-        }
-        return response.toByteArray();
-    }
-
-}
--- a/app/src/main/java/com/btchip/comm/android/BTChipTransportAndroidHID.java
+++ b/app/src/main/java/com/btchip/comm/android/BTChipTransportAndroidHID.java
@@ -1,145 +0,0 @@
-/*
- *******************************************************************************
- *   BTChip Bitcoin Hardware Wallet Java API
- *   (c) 2014 BTChip - 1BTChip7VfTnrPra5jqci7ejnMguuHogTn
- *   (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.btchip.comm.android;
-
-import android.hardware.usb.UsbConstants;
-import android.hardware.usb.UsbDevice;
-import android.hardware.usb.UsbDeviceConnection;
-import android.hardware.usb.UsbEndpoint;
-import android.hardware.usb.UsbInterface;
-import android.hardware.usb.UsbManager;
-import android.hardware.usb.UsbRequest;
-
-import com.btchip.BTChipException;
-import com.btchip.comm.BTChipTransport;
-import com.btchip.comm.LedgerHelper;
-import com.btchip.utils.Dump;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.HashMap;
-
-import timber.log.Timber;
-
-public class BTChipTransportAndroidHID implements BTChipTransport {
-
-    public static UsbDevice getDevice(UsbManager manager) {
-        HashMap<String, UsbDevice> deviceList = manager.getDeviceList();
-        for (UsbDevice device : deviceList.values()) {
-            Timber.d("%04X:%04X %s, %s", device.getVendorId(), device.getProductId(), device.getManufacturerName(), device.getProductName());
-            if ((device.getVendorId() == VID) && (device.getProductId() == PID_HID)) {
-                return device;
-            }
-        }
-        return null;
-    }
-
-    public static BTChipTransport open(UsbManager manager, UsbDevice device) throws IOException {
-        UsbDeviceConnection connection = manager.openDevice(device);
-        if (connection == null) throw new IOException("Device not connected");
-        // Must only be called once permission is granted (see http://developer.android.com/reference/android/hardware/usb/UsbManager.html)
-        // Important if enumerating, rather than being awaken by the intent notification
-        UsbInterface dongleInterface = device.getInterface(0);
-        UsbEndpoint in = null;
-        UsbEndpoint out = null;
-        for (int i = 0; i < dongleInterface.getEndpointCount(); i++) {
-            UsbEndpoint tmpEndpoint = dongleInterface.getEndpoint(i);
-            if (tmpEndpoint.getDirection() == UsbConstants.USB_DIR_IN) {
-                in = tmpEndpoint;
-            } else {
-                out = tmpEndpoint;
-            }
-        }
-        connection.claimInterface(dongleInterface, true);
-        return new BTChipTransportAndroidHID(connection, dongleInterface, in, out);
-    }
-
-    private static final int VID = 0x2C97;
-    private static final int PID_HID = 0x0001;
-
-    private UsbDeviceConnection connection;
-    private UsbInterface dongleInterface;
-    private UsbEndpoint in;
-    private UsbEndpoint out;
-    private byte transferBuffer[];
-    private boolean debug;
-
-    public BTChipTransportAndroidHID(UsbDeviceConnection connection, UsbInterface dongleInterface, UsbEndpoint in, UsbEndpoint out) {
-        this.connection = connection;
-        this.dongleInterface = dongleInterface;
-        this.in = in;
-        this.out = out;
-        transferBuffer = new byte[HID_BUFFER_SIZE];
-    }
-
-    @Override
-    public byte[] exchange(byte[] command) {
-        ByteArrayOutputStream response = new ByteArrayOutputStream();
-        byte[] responseData = null;
-        int offset = 0;
-        if (debug) {
-            Timber.d("=> %s", Dump.dump(command));
-        }
-        command = LedgerHelper.wrapCommandAPDU(LEDGER_DEFAULT_CHANNEL, command, HID_BUFFER_SIZE);
-        UsbRequest requestOut = new UsbRequest();
-        requestOut.initialize(connection, out);
-        while (offset != command.length) {
-            int blockSize = (command.length - offset > HID_BUFFER_SIZE ? HID_BUFFER_SIZE : command.length - offset);
-            System.arraycopy(command, offset, transferBuffer, 0, blockSize);
-            requestOut.queue(ByteBuffer.wrap(transferBuffer), HID_BUFFER_SIZE);
-            connection.requestWait();
-            offset += blockSize;
-        }
-        requestOut.close();
-        ByteBuffer responseBuffer = ByteBuffer.allocate(HID_BUFFER_SIZE);
-        UsbRequest requestIn = new UsbRequest();
-        requestIn.initialize(connection, in);
-        while ((responseData = LedgerHelper.unwrapResponseAPDU(LEDGER_DEFAULT_CHANNEL, response.toByteArray(), HID_BUFFER_SIZE)) == null) {
-            responseBuffer.clear();
-            requestIn.queue(responseBuffer, HID_BUFFER_SIZE);
-            connection.requestWait();
-            responseBuffer.rewind();
-            responseBuffer.get(transferBuffer, 0, HID_BUFFER_SIZE);
-            response.write(transferBuffer, 0, HID_BUFFER_SIZE);
-        }
-        requestIn.close();
-        if (debug) {
-            Timber.d("<= %s", Dump.dump(responseData));
-        }
-        return responseData;
-    }
-
-    @Override
-    public void close() {
-        connection.releaseInterface(dongleInterface);
-        connection.close();
-    }
-
-    @Override
-    public void setDebug(boolean debugFlag) {
-        this.debug = debugFlag;
-    }
-
-    private static final int HID_BUFFER_SIZE = 64;
-    private static final int LEDGER_DEFAULT_CHANNEL = 1;
-    private static final int SW1_DATA_AVAILABLE = 0x61;
-}
--- a/app/src/main/java/com/btchip/utils/Dump.java
+++ b/app/src/main/java/com/btchip/utils/Dump.java
@@ -1,62 +0,0 @@
-/*
- *******************************************************************************
- *   BTChip Bitcoin Hardware Wallet Java API
- *   (c) 2014 BTChip - 1BTChip7VfTnrPra5jqci7ejnMguuHogTn
- *
- *  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.btchip.utils;
-
-import java.io.ByteArrayOutputStream;
-
-public class Dump {
-
-    public static String dump(byte[] buffer, int offset, int length) {
-        String result = "";
-        for (int i = 0; i < length; i++) {
-            String temp = Integer.toHexString((buffer[offset + i]) & 0xff);
-            if (temp.length() < 2) {
-                temp = "0" + temp;
-            }
-            result += temp;
-        }
-        return result;
-    }
-
-    public static String dump(byte[] buffer) {
-        return dump(buffer, 0, buffer.length);
-    }
-
-    public static byte[] hexToBin(String src) {
-        ByteArrayOutputStream result = new ByteArrayOutputStream();
-        int i = 0;
-        while (i < src.length()) {
-            char x = src.charAt(i);
-            if (!((x >= '0' && x <= '9') || (x >= 'A' && x <= 'F') || (x >= 'a' && x <= 'f'))) {
-                i++;
-                continue;
-            }
-            try {
-                result.write(Integer.valueOf("" + src.charAt(i) + src.charAt(i + 1), 16));
-                i += 2;
-            } catch (Exception e) {
-                return null;
-            }
-        }
-        return result.toByteArray();
-    }
-
-
-}
--- a/app/src/main/java/com/m2049r/aeonwallet/GenerateFragment.java
+++ b/app/src/main/java/com/m2049r/aeonwallet/GenerateFragment.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.m2049r.xmrwallet;
+package com.m2049r.aeonwallet;

 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.xmrwallet.model.Wallet;
-import com.m2049r.xmrwallet.model.WalletManager;
-import com.m2049r.xmrwallet.util.FingerprintHelper;
-import com.m2049r.xmrwallet.util.Helper;
-import com.m2049r.xmrwallet.util.KeyStoreHelper;
-import com.m2049r.xmrwallet.util.RestoreHeight;
-import com.m2049r.xmrwallet.widget.Toolbar;
+import com.m2049r.aeonwallet.model.Wallet;
+import com.m2049r.aeonwallet.model.WalletManager;
+import com.m2049r.aeonwallet.util.FingerprintHelper;
+import com.m2049r.aeonwallet.util.Helper;
+import com.m2049r.aeonwallet.util.KeyStoreHelper;
+import com.m2049r.aeonwallet.util.RestoreHeight;
+import com.m2049r.aeonwallet.widget.Toolbar;
 import com.nulabinc.zxcvbn.Strength;
 import com.nulabinc.zxcvbn.Zxcvbn;

@@ -61,7 +61,6 @@ public class GenerateFragment extends Fragment {
    static final String TYPE_NEW = "new";
    static final String TYPE_KEY = "key";
    static final String TYPE_SEED = "seed";
-    static final String TYPE_LEDGER = "ledger";
    static final String TYPE_VIEWONLY = "view";

    private TextInputLayout etWalletName;
@@ -191,17 +190,6 @@ public class GenerateFragment extends Fragment {
                    return false;
                }
            });
-        } else if (type.equals(TYPE_LEDGER)) {
-            etWalletPassword.getEditText().setImeOptions(EditorInfo.IME_ACTION_DONE);
-            etWalletPassword.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)) {
-                        etWalletRestoreHeight.requestFocus();
-                        return true;
-                    }
-                    return false;
-                }
-            });
        } else if (type.equals(TYPE_SEED)) {
            etWalletPassword.getEditText().setOnEditorActionListener(new TextView.OnEditorActionListener() {
                public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
@@ -403,31 +391,24 @@ public class GenerateFragment extends Fragment {
            // is it a date?
            SimpleDateFormat parser = new SimpleDateFormat("yyyy-MM-dd");
            parser.setLenient(false);
-            height = RestoreHeight.getInstance().getHeight(parser.parse(restoreHeight));
-        } catch (ParseException ex) {
-        }
-        if (height <= 0)
-            try {
-                // is it a date without dashes?
-                SimpleDateFormat parser = new SimpleDateFormat("yyyyMMdd");
-                parser.setLenient(false);
-                height = RestoreHeight.getInstance().getHeight(parser.parse(restoreHeight));
-            } catch (ParseException ex) {
-            }
-        if (height <= 0)
+            parser.parse(restoreHeight);
+            height = RestoreHeight.getInstance().getHeight(restoreHeight);
+        } catch (ParseException exPE) {
            try {
                // or is it a height?
                height = Long.parseLong(restoreHeight);
-            } catch (NumberFormatException ex) {
+            } 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
+        int seedWords = seed.split("\\s").length;
+        boolean ok = ((seedWords == 25) || (seedWords == 24)); // 24 are old style
        if (!ok) {
            etWalletMnemonic.setError(getString(R.string.generate_check_mnemonic));
        } else {
@@ -497,12 +478,6 @@ public class GenerateFragment extends Fragment {
                KeyStoreHelper.saveWalletUserPass(getActivity(), name, password);
            }
            activityCallback.onGenerate(name, crazyPass, seed, height);
-        } else if (type.equals(TYPE_LEDGER)) {
-            bGenerate.setEnabled(false);
-            if (fingerprintAuthAllowed) {
-                KeyStoreHelper.saveWalletUserPass(getActivity(), name, password);
-            }
-            activityCallback.onGenerateLedger(name, crazyPass, height);
        } else if (type.equals(TYPE_KEY) || type.equals(TYPE_VIEWONLY)) {
            if (checkAddress() && checkViewKey() && checkSpendKey()) {
                bGenerate.setEnabled(false);
@@ -541,8 +516,6 @@ public class GenerateFragment extends Fragment {
                return getString(R.string.generate_wallet_type_new);
            case TYPE_SEED:
                return getString(R.string.generate_wallet_type_seed);
-            case TYPE_LEDGER:
-                return getString(R.string.generate_wallet_type_ledger);
            case TYPE_VIEWONLY:
                return getString(R.string.generate_wallet_type_view);
            default:
@@ -560,8 +533,6 @@ public class GenerateFragment extends Fragment {

        void onGenerate(String name, String password, String address, String viewKey, String spendKey, long height);

-        void onGenerateLedger(String name, String password, long height);
-
        void setTitle(String title);

        void setToolbarButton(int type);
@@ -597,9 +568,6 @@ public class GenerateFragment extends Fragment {
            case TYPE_SEED:
                inflater.inflate(R.menu.create_wallet_seed, menu);
                break;
-            case TYPE_LEDGER:
-                inflater.inflate(R.menu.create_wallet_ledger, menu);
-                break;
            case TYPE_VIEWONLY:
                inflater.inflate(R.menu.create_wallet_view, menu);
                break;
--- a/app/src/main/java/com/m2049r/aeonwallet/GenerateReviewFragment.java
+++ b/app/src/main/java/com/m2049r/aeonwallet/GenerateReviewFragment.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.m2049r.xmrwallet;
+package com.m2049r.aeonwallet;

 import android.app.AlertDialog;
 import android.content.Context;
@@ -43,16 +43,16 @@ import android.widget.Switch;
 import android.widget.TextView;
 import android.widget.Toast;

-import com.m2049r.xmrwallet.ledger.Ledger;
-import com.m2049r.xmrwallet.ledger.LedgerProgressDialog;
-import com.m2049r.xmrwallet.model.NetworkType;
-import com.m2049r.xmrwallet.model.Wallet;
-import com.m2049r.xmrwallet.model.WalletManager;
-import com.m2049r.xmrwallet.util.FingerprintHelper;
-import com.m2049r.xmrwallet.util.Helper;
-import com.m2049r.xmrwallet.util.KeyStoreHelper;
-import com.m2049r.xmrwallet.util.MoneroThreadPoolExecutor;
-import com.m2049r.xmrwallet.widget.Toolbar;
+import com.m2049r.aeonwallet.model.NetworkType;
+import com.m2049r.aeonwallet.model.Wallet;
+import com.m2049r.aeonwallet.model.WalletManager;
+import com.m2049r.aeonwallet.util.FingerprintHelper;
+import com.m2049r.aeonwallet.util.Helper;
+import com.m2049r.aeonwallet.util.KeyStoreHelper;
+import com.m2049r.aeonwallet.util.MoneroThreadPoolExecutor;
+import com.m2049r.aeonwallet.widget.Toolbar;
+
+import java.io.File;

 import timber.log.Timber;

@@ -76,9 +76,6 @@ public class GenerateReviewFragment extends Fragment {
    private ImageButton bCopyAddress;
    private LinearLayout llAdvancedInfo;
    private LinearLayout llPassword;
-    private LinearLayout llMnemonic;
-    private LinearLayout llSpendKey;
-    private LinearLayout llViewKey;
    private Button bAdvancedInfo;
    private Button bAccept;

@@ -102,9 +99,6 @@ public class GenerateReviewFragment extends Fragment {
        bAdvancedInfo = (Button) view.findViewById(R.id.bAdvancedInfo);
        llAdvancedInfo = (LinearLayout) view.findViewById(R.id.llAdvancedInfo);
        llPassword = (LinearLayout) view.findViewById(R.id.llPassword);
-        llMnemonic = (LinearLayout) view.findViewById(R.id.llMnemonic);
-        llSpendKey = (LinearLayout) view.findViewById(R.id.llSpendKey);
-        llViewKey = (LinearLayout) view.findViewById(R.id.llViewKey);

        bAccept = (Button) view.findViewById(R.id.bAccept);

@@ -148,6 +142,7 @@ public class GenerateReviewFragment extends Fragment {
    }

    void showDetails() {
+        showProgress();
        tvWalletPassword.setText(null);
        new AsyncShow().executeOnExecutor(MoneroThreadPoolExecutor.MONERO_THREAD_POOL_EXECUTOR, walletPath);
    }
@@ -193,20 +188,6 @@ public class GenerateReviewFragment extends Fragment {
        boolean isWatchOnly;
        Wallet.Status status;

-        boolean dialogOpened = false;
-
-        @Override
-        protected void onPreExecute() {
-            super.onPreExecute();
-            showProgress();
-            if ((walletPath != null)
-                    && (WalletManager.getInstance().queryWalletHardware(walletPath + ".keys", getPassword()) == 1)
-                    && (progressCallback != null)) {
-                progressCallback.showLedgerProgressDialog(LedgerProgressDialog.TYPE_RESTORE);
-                dialogOpened = true;
-            }
-        }
-
        @Override
        protected Boolean doInBackground(String... params) {
            if (params.length != 1) return false;
@@ -231,11 +212,7 @@ public class GenerateReviewFragment extends Fragment {

            address = wallet.getAddress();
            seed = wallet.getSeed();
-            if (wallet.isKeyOnDevice()) {
-                viewKey = Ledger.Key();
-            } else {
-                viewKey = wallet.getSecretViewKey();
-            }
+            viewKey = wallet.getSecretViewKey();
            spendKey = isWatchOnly ? getActivity().getString(R.string.label_watchonly) : wallet.getSecretSpendKey();
            isWatchOnly = wallet.isWatchOnly();
            if (closeWallet) wallet.close();
@@ -245,8 +222,6 @@ public class GenerateReviewFragment extends Fragment {
        @Override
        protected void onPostExecute(Boolean result) {
            super.onPostExecute(result);
-            if (dialogOpened)
-                progressCallback.dismissProgressDialog();
            if (!isAdded()) return; // never mind
            walletName = name;
            if (result) {
@@ -257,22 +232,10 @@ public class GenerateReviewFragment extends Fragment {
                llPassword.setVisibility(View.VISIBLE);
                tvWalletPassword.setText(getPassword());
                tvWalletAddress.setText(address);
-                if (!seed.isEmpty()) {
-                    llMnemonic.setVisibility(View.VISIBLE);
-                    tvWalletMnemonic.setText(seed);
-                }
-                boolean showAdvanced = false;
-                if (isKeyValid(viewKey)) {
-                    llViewKey.setVisibility(View.VISIBLE);
-                    tvWalletViewKey.setText(viewKey);
-                    showAdvanced = true;
-                }
-                if (isKeyValid(spendKey)) {
-                    llSpendKey.setVisibility(View.VISIBLE);
-                    tvWalletSpendKey.setText(spendKey);
-                    showAdvanced = true;
-                }
-                if (showAdvanced) bAdvancedInfo.setVisibility(View.VISIBLE);
+                tvWalletMnemonic.setText(seed);
+                tvWalletViewKey.setText(viewKey);
+                tvWalletSpendKey.setText(spendKey);
+                bAdvancedInfo.setVisibility(View.VISIBLE);
                bCopyAddress.setClickable(true);
                bCopyAddress.setImageResource(R.drawable.ic_content_copy_black_24dp);
                activityCallback.setTitle(name, getString(R.string.details_title));
@@ -304,8 +267,6 @@ public class GenerateReviewFragment extends Fragment {
    public interface ProgressListener {
        void showProgressDialog(int msgId);

-        void showLedgerProgressDialog(int mode);
-
        void dismissProgressDialog();
    }

@@ -616,10 +577,4 @@ public class GenerateReviewFragment extends Fragment {
        return openDialog;
    }

-    private boolean isKeyValid(String key) {
-        return (key != null) && (key.length() == 64)
-                && !key.equals("0000000000000000000000000000000000000000000000000000000000000000")
-                && !key.toLowerCase().equals("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
-        // ledger implmenetation returns the spend key as f's
-    }
 }
--- a/app/src/main/java/com/m2049r/aeonwallet/LoginActivity.java
+++ b/app/src/main/java/com/m2049r/aeonwallet/LoginActivity.java
--- a/app/src/main/java/com/m2049r/aeonwallet/LoginFragment.java
+++ b/app/src/main/java/com/m2049r/aeonwallet/LoginFragment.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.m2049r.xmrwallet;
+package com.m2049r.aeonwallet;

 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.xmrwallet.layout.WalletInfoAdapter;
-import com.m2049r.xmrwallet.model.NetworkType;
-import com.m2049r.xmrwallet.model.WalletManager;
-import com.m2049r.xmrwallet.util.Helper;
-import com.m2049r.xmrwallet.util.KeyStoreHelper;
-import com.m2049r.xmrwallet.util.NodeList;
-import com.m2049r.xmrwallet.util.Notice;
-import com.m2049r.xmrwallet.widget.DropDownEditText;
-import com.m2049r.xmrwallet.widget.Toolbar;
+import com.m2049r.aeonwallet.layout.WalletInfoAdapter;
+import com.m2049r.aeonwallet.model.NetworkType;
+import com.m2049r.aeonwallet.model.WalletManager;
+import com.m2049r.aeonwallet.util.Helper;
+import com.m2049r.aeonwallet.util.KeyStoreHelper;
+import com.m2049r.aeonwallet.util.NodeList;
+import com.m2049r.aeonwallet.util.Notice;
+import com.m2049r.aeonwallet.widget.DropDownEditText;
+import com.m2049r.aeonwallet.widget.Toolbar;

 import java.io.File;
 import java.util.ArrayList;
@@ -103,7 +103,6 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter

        void setNetworkType(NetworkType networkType);

-        boolean hasLedger();
    }

    @Override
@@ -146,13 +145,11 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
        fabView = (FloatingActionButton) view.findViewById(R.id.fabView);
        fabKey = (FloatingActionButton) view.findViewById(R.id.fabKey);
        fabSeed = (FloatingActionButton) view.findViewById(R.id.fabSeed);
-        fabLedger = (FloatingActionButton) view.findViewById(R.id.fabLedger);

        fabNewL = (RelativeLayout) view.findViewById(R.id.fabNewL);
        fabViewL = (RelativeLayout) view.findViewById(R.id.fabViewL);
        fabKeyL = (RelativeLayout) view.findViewById(R.id.fabKeyL);
        fabSeedL = (RelativeLayout) view.findViewById(R.id.fabSeedL);
-        fabLedgerL = (RelativeLayout) view.findViewById(R.id.fabLedgerL);

        fab_pulse = AnimationUtils.loadAnimation(getContext(), R.anim.fab_pulse);
        fab_open_screen = AnimationUtils.loadAnimation(getContext(), R.anim.fab_open_screen);
@@ -166,7 +163,6 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
        fabView.setOnClickListener(this);
        fabKey.setOnClickListener(this);
        fabSeed.setOnClickListener(this);
-        fabLedger.setOnClickListener(this);
        fabScreen.setOnClickListener(this);

        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.list);
@@ -177,7 +173,7 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
        etDummy = (EditText) view.findViewById(R.id.etDummy);

        ViewGroup llNotice = (ViewGroup) view.findViewById(R.id.llNotice);
-        Notice.showAll(llNotice, ".*_login");
+        Notice.showAll(llNotice,".*_login");

        etDaemonAddress = (DropDownEditText) view.findViewById(R.id.etDaemonAddress);
        nodeAdapter = new ArrayAdapter<>(getContext(), android.R.layout.simple_dropdown_item_1line);
@@ -270,11 +266,11 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
    private String addressPrefix() {
        switch (WalletManager.getInstance().getNetworkType()) {
            case NetworkType_Testnet:
-                return "9A-";
+                return "-"; // no idea
            case NetworkType_Mainnet:
-                return "4-";
+                return "W-"; // guess
            case NetworkType_Stagenet:
-                return "5-";
+                return "S-"; // guess
            default:
                throw new IllegalStateException("Unsupported Network: " + WalletManager.getInstance().getNetworkType());
        }
@@ -372,11 +368,9 @@ 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 =
-            "node.moneroworld.com:18089;node.xmrbackb.one;node.xmr.be";
+    private static final String PREF_DAEMONLIST_MAINNET = "aeon.monerujo.io";

-    private static final String PREF_DAEMONLIST_STAGENET =
-            "stagenet.monerujo.io;stagenet.xmr-tw.org";
+    private static final String PREF_DAEMONLIST_STAGENET = "aeon.monerujo.io";

    private NodeList daemonStageNet;
    private NodeList daemonMainNet;
@@ -430,9 +424,9 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
    }

    private boolean isFabOpen = false;
-    private FloatingActionButton fab, fabNew, fabView, fabKey, fabSeed, fabLedger;
+    private FloatingActionButton fab, fabNew, fabView, fabKey, fabSeed;
    private FrameLayout fabScreen;
-    private RelativeLayout fabNewL, fabViewL, fabKeyL, fabSeedL, fabLedgerL;
+    private RelativeLayout fabNewL, fabViewL, fabKeyL, fabSeedL;
    private Animation fab_open, fab_close, rotate_forward, rotate_backward, fab_open_screen, fab_close_screen;
    private Animation fab_pulse;

@@ -441,53 +435,32 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
    }

    public void animateFAB() {
-        if (isFabOpen) { // close the fab
+        if (isFabOpen) {
+            fabScreen.setVisibility(View.INVISIBLE);
            fabScreen.setClickable(false);
            fabScreen.startAnimation(fab_close_screen);
            fab.startAnimation(rotate_backward);
-            if (fabLedgerL.getVisibility() == View.VISIBLE) {
-                fabLedgerL.startAnimation(fab_close);
-                fabLedger.setClickable(false);
-            } else {
-                fabNewL.startAnimation(fab_close);
-                fabNew.setClickable(false);
-                fabViewL.startAnimation(fab_close);
-                fabView.setClickable(false);
-                fabKeyL.startAnimation(fab_close);
-                fabKey.setClickable(false);
-                fabSeedL.startAnimation(fab_close);
-                fabSeed.setClickable(false);
-            }
+            fabNewL.startAnimation(fab_close);
+            fabNew.setClickable(false);
+            fabViewL.startAnimation(fab_close);
+            fabView.setClickable(false);
+            fabKeyL.startAnimation(fab_close);
+            fabKey.setClickable(false);
+            fabSeedL.startAnimation(fab_close);
+            fabSeed.setClickable(false);
            isFabOpen = false;
-        } else { // open the fab
+        } else {
            fabScreen.setClickable(true);
            fabScreen.startAnimation(fab_open_screen);
            fab.startAnimation(rotate_forward);
-            if (activityCallback.hasLedger()) {
-                fabLedgerL.setVisibility(View.VISIBLE);
-                fabNewL.setVisibility(View.GONE);
-                fabViewL.setVisibility(View.GONE);
-                fabKeyL.setVisibility(View.GONE);
-                fabSeedL.setVisibility(View.GONE);
-
-                fabLedgerL.startAnimation(fab_open);
-                fabLedger.setClickable(true);
-            } else {
-                fabLedgerL.setVisibility(View.GONE);
-                fabNewL.setVisibility(View.VISIBLE);
-                fabViewL.setVisibility(View.VISIBLE);
-                fabKeyL.setVisibility(View.VISIBLE);
-                fabSeedL.setVisibility(View.VISIBLE);
-
-                fabNewL.startAnimation(fab_open);
-                fabNew.setClickable(true);
-                fabViewL.startAnimation(fab_open);
-                fabView.setClickable(true);
-                fabKeyL.startAnimation(fab_open);
-                fabKey.setClickable(true);
-                fabSeedL.startAnimation(fab_open);
-                fabSeed.setClickable(true);
-            }
+            fabNewL.startAnimation(fab_open);
+            fabNew.setClickable(true);
+            fabViewL.startAnimation(fab_open);
+            fabView.setClickable(true);
+            fabKeyL.startAnimation(fab_open);
+            fabKey.setClickable(true);
+            fabSeedL.startAnimation(fab_open);
+            fabSeed.setClickable(true);
            isFabOpen = true;
        }
    }
@@ -495,7 +468,6 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
    @Override
    public void onClick(View v) {
        int id = v.getId();
-        Timber.d("onClick %d/%d", id, R.id.fabLedger);
        switch (id) {
            case R.id.fab:
                animateFAB();
@@ -517,11 +489,6 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
                animateFAB();
                activityCallback.onAddWallet(GenerateFragment.TYPE_SEED);
                break;
-            case R.id.fabLedger:
-                Timber.d("FAB_LEDGER");
-                animateFAB();
-                activityCallback.onAddWallet(GenerateFragment.TYPE_LEDGER);
-                break;
            case R.id.fabScreen:
                animateFAB();
                break;
--- a/app/src/main/java/com/m2049r/aeonwallet/OnBackPressedListener.java
+++ b/app/src/main/java/com/m2049r/aeonwallet/OnBackPressedListener.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.m2049r.xmrwallet;
+package com.m2049r.aeonwallet;

 public interface OnBackPressedListener {
    boolean onBackPressed();
--- a/app/src/main/java/com/m2049r/aeonwallet/ReceiveFragment.java
+++ b/app/src/main/java/com/m2049r/aeonwallet/ReceiveFragment.java
--- a/app/src/main/java/com/m2049r/aeonwallet/ScannerFragment.java
+++ b/app/src/main/java/com/m2049r/aeonwallet/ScannerFragment.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.m2049r.xmrwallet;
+package com.m2049r.aeonwallet;

 import android.content.Context;
 import android.os.Bundle;
--- a/app/src/main/java/com/m2049r/aeonwallet/SecureActivity.java
+++ b/app/src/main/java/com/m2049r/aeonwallet/SecureActivity.java
@@ -14,14 +14,15 @@
 * limitations under the License.
 */

-package com.m2049r.xmrwallet;
+package com.m2049r.aeonwallet;

-import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;

-import com.m2049r.xmrwallet.util.LocaleHelper;
+import com.m2049r.aeonwallet.util.Helper;
+
+import java.io.File;

 import static android.view.WindowManager.LayoutParams;

@@ -35,9 +36,4 @@ public abstract class SecureActivity extends AppCompatActivity {
            getWindow().setFlags(LayoutParams.FLAG_SECURE, LayoutParams.FLAG_SECURE);
        }
    }
-
-    @Override
-    protected void attachBaseContext(Context context) {
-        super.attachBaseContext(LocaleHelper.setLocale(context, LocaleHelper.getLocale(context)));
-    }
 }
--- a/app/src/main/java/com/m2049r/aeonwallet/TxFragment.java
+++ b/app/src/main/java/com/m2049r/aeonwallet/TxFragment.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.m2049r.xmrwallet;
+package com.m2049r.aeonwallet;

 import android.content.Context;
 import android.content.Intent;
@@ -30,14 +30,12 @@ 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 com.m2049r.aeonwallet.model.TransactionInfo;
+import com.m2049r.aeonwallet.model.Transfer;
+import com.m2049r.aeonwallet.model.Wallet;
+import com.m2049r.aeonwallet.util.UserNotes;
+import com.m2049r.aeonwallet.widget.Toolbar;

 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -59,7 +57,6 @@ public class TxFragment extends Fragment {
        TS_FORMATTER.setTimeZone(tz);
    }

-    private TextView tvAccount;
    private TextView tvTxTimestamp;
    private TextView tvTxId;
    private TextView tvTxKey;
@@ -72,24 +69,12 @@ 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);
        tvTxKey = (TextView) view.findViewById(R.id.tvTxKey);
@@ -115,14 +100,6 @@ 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);
@@ -224,8 +201,6 @@ 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));
-
        tvTxTimestamp.setText(TS_FORMATTER.format(new Date(info.timestamp * 1000)));
        tvTxId.setText(info.hash);
        tvTxKey.setText(info.txKey.isEmpty() ? "-" : info.txKey);
@@ -240,6 +215,9 @@ public class TxFragment extends Fragment {
        String sign = (info.direction == TransactionInfo.Direction.Direction_In ? "+" : "-");

        long realAmount = info.amount;
+        if (info.isPending) {
+            realAmount = realAmount - info.fee;
+        }
        tvTxAmount.setText(sign + Wallet.getDisplayAmount(realAmount));

        if ((info.fee > 0)) {
@@ -287,29 +265,13 @@ public class TxFragment extends Fragment {
            }
        } else {
            sb.append("-");
-            dstSb.append(info.direction ==
-                    TransactionInfo.Direction.Direction_In ?
-                    activityCallback.getWalletSubaddress(info.account, info.subaddress) :
-                    "-");
+            dstSb.append(info.direction == TransactionInfo.Direction.Direction_In ? activityCallback.getWalletAddress() : "-");
        }
        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);
@@ -325,7 +287,7 @@ public class TxFragment extends Fragment {
    Listener activityCallback;

    public interface Listener {
-        String getWalletSubaddress(int accountIndex, int subaddressIndex);
+        String getWalletAddress();

        String getTxKey(String hash);

--- a/app/src/main/java/com/m2049r/aeonwallet/WalletActivity.java
+++ b/app/src/main/java/com/m2049r/aeonwallet/WalletActivity.java
--- a/app/src/main/java/com/m2049r/aeonwallet/WalletFragment.java
+++ b/app/src/main/java/com/m2049r/aeonwallet/WalletFragment.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.m2049r.xmrwallet;
+package com.m2049r.aeonwallet;

 import android.content.Context;
 import android.os.Bundle;
@@ -37,14 +37,16 @@ import android.widget.ProgressBar;
 import android.widget.Spinner;
 import android.widget.TextView;

-import com.m2049r.xmrwallet.layout.TransactionInfoAdapter;
-import com.m2049r.xmrwallet.model.TransactionInfo;
-import com.m2049r.xmrwallet.model.Wallet;
-import com.m2049r.xmrwallet.service.exchange.api.ExchangeApi;
-import com.m2049r.xmrwallet.service.exchange.api.ExchangeCallback;
-import com.m2049r.xmrwallet.service.exchange.api.ExchangeRate;
-import com.m2049r.xmrwallet.util.Helper;
-import com.m2049r.xmrwallet.widget.Toolbar;
+import com.m2049r.aeonwallet.layout.TransactionInfoAdapter;
+import com.m2049r.aeonwallet.model.TransactionInfo;
+import com.m2049r.aeonwallet.model.Wallet;
+import com.m2049r.aeonwallet.service.exchange.api.ExchangeApi;
+import com.m2049r.aeonwallet.service.exchange.api.ExchangeCallback;
+import com.m2049r.aeonwallet.service.exchange.api.ExchangeRate;
+import com.m2049r.aeonwallet.service.exchange.kraken.ExchangeApiImpl;
+import com.m2049r.aeonwallet.util.Helper;
+import com.m2049r.aeonwallet.util.OkHttpClientSingleton;
+import com.m2049r.aeonwallet.widget.Toolbar;

 import java.text.NumberFormat;
 import java.util.List;
@@ -99,9 +101,7 @@ public class WalletFragment extends Fragment
        ivSynced = (ImageView) view.findViewById(R.id.ivSynced);

        sCurrency = (Spinner) view.findViewById(R.id.sCurrency);
-        ArrayAdapter currencyAdapter = ArrayAdapter.createFromResource(getContext(), R.array.currency, R.layout.item_spinner_balance);
-        currencyAdapter.setDropDownViewResource(R.layout.item_spinner_dropdown_item);
-        sCurrency.setAdapter(currencyAdapter);
+        sCurrency.setAdapter(ArrayAdapter.createFromResource(getContext(), R.array.currency, R.layout.item_spinner_balance));

        bSend = (Button) view.findViewById(R.id.bSend);
        bReceive = (Button) view.findViewById(R.id.bReceive);
@@ -150,7 +150,7 @@ public class WalletFragment extends Fragment
        // at this point selection is XMR in case of error
        String displayB;
        double amountA = Double.parseDouble(Wallet.getDisplayAmount(unlockedBalance)); // crash if this fails!
-        if (!Helper.CRYPTO.equals(balanceCurrency)) { // not XMR
+        if (!"XMR".equals(balanceCurrency)) { // not XMR
            double amountB = amountA * balanceRate;
            displayB = Helper.getFormattedAmount(amountB, false);
        } else { // XMR
@@ -159,10 +159,10 @@ public class WalletFragment extends Fragment
        tvBalance.setText(displayB);
    }

-    String balanceCurrency = Helper.CRYPTO;
+    String balanceCurrency = "XMR";
    double balanceRate = 1.0;

-    private final ExchangeApi exchangeApi = Helper.getExchangeApi();
+    private final ExchangeApi exchangeApi = new ExchangeApiImpl(OkHttpClientSingleton.getOkHttpClient());

    void refreshBalance() {
        if (sCurrency.getSelectedItemPosition() == 0) { // XMR
@@ -170,10 +170,9 @@ public class WalletFragment extends Fragment
            tvBalance.setText(Helper.getFormattedAmount(amountXmr, true));
        } else { // not XMR
            String currency = (String) sCurrency.getSelectedItem();
-            Timber.d(currency);
            if (!currency.equals(balanceCurrency) || (balanceRate <= 0)) {
                showExchanging();
-                exchangeApi.queryExchangeRate(Helper.CRYPTO, currency,
+                exchangeApi.queryExchangeRate("XMR", currency,
                        new ExchangeCallback() {
                            @Override
                            public void onSuccess(final ExchangeRate exchangeRate) {
@@ -229,10 +228,10 @@ public class WalletFragment extends Fragment

    public void exchange(final ExchangeRate exchangeRate) {
        hideExchanging();
-        if (!Helper.CRYPTO.equals(exchangeRate.getBaseCurrency())) {
+        if (!"XMR".equals(exchangeRate.getBaseCurrency())) {
            Timber.e("Not XMR");
            sCurrency.setSelection(0, true);
-            balanceCurrency = Helper.CRYPTO;
+            balanceCurrency = "XMR";
            balanceRate = 1.0;
        } else {
            int spinnerPosition = ((ArrayAdapter) sCurrency.getAdapter()).getPosition(exchangeRate.getQuoteCurrency());
@@ -257,7 +256,7 @@ public class WalletFragment extends Fragment
    // called from activity

    public void onRefreshed(final Wallet wallet, final boolean full) {
-        Timber.d("onRefreshed(%b)", full);
+        Timber.d("onRefreshed()");
        if (full) {
            List<TransactionInfo> list = wallet.getHistory().getAll();
            adapter.setInfos(list);
@@ -271,7 +270,6 @@ public class WalletFragment extends Fragment
            bSend.setVisibility(View.VISIBLE);
            bSend.setEnabled(true);
        }
-        if (isVisible()) enableAccountsList(true); //otherwise it is enabled in onResume()
    }

    boolean walletLoaded = false;
@@ -315,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.getAccountLabel();
+        walletSubtitle = wallet.getAddress().substring(0, 10) + "…" + watchOnly;
        activityCallback.setTitle(walletTitle, walletSubtitle);
        Timber.d("wallet title is %s", walletTitle);
    }
@@ -325,13 +323,10 @@ public class WalletFragment extends Fragment
    private String walletSubtitle = null;
    private long unlockedBalance = 0;

-    private int accountIdx = -1;
-
    private void updateStatus(Wallet wallet) {
        if (!isAdded()) return;
        Timber.d("updateStatus()");
-        if ((walletTitle == null) || (accountIdx != wallet.getAccountIndex())) {
-            accountIdx = wallet.getAccountIndex();
+        if (walletTitle == null) {
            setActivityTitle(wallet);
        }
        long balance = wallet.getBalance();
@@ -417,28 +412,9 @@ public class WalletFragment extends Fragment
        super.onResume();
        Timber.d("onResume()");
        activityCallback.setTitle(walletTitle, walletSubtitle);
-        //activityCallback.setToolbarButton(Toolbar.BUTTON_CLOSE); // TODO: Close button somewhere else
-        activityCallback.setToolbarButton(Toolbar.BUTTON_NONE);
+        activityCallback.setToolbarButton(Toolbar.BUTTON_CLOSE);
        setProgress(syncProgress);
        setProgress(syncText);
        showReceive();
-        if (activityCallback.isSynced()) enableAccountsList(true);
    }
-
-    @Override
-    public void onPause() {
-        enableAccountsList(false);
-        super.onPause();
-    }
-
-    public interface DrawerLocker {
-        void setDrawerEnabled(boolean enabled);
-    }
-
-    private void enableAccountsList(boolean enable) {
-        if (activityCallback instanceof DrawerLocker) {
-            ((DrawerLocker) activityCallback).setDrawerEnabled(enable);
-        }
-    }
-
 }
--- a/app/src/main/java/com/m2049r/aeonwallet/XmrWalletApplication.java
+++ b/app/src/main/java/com/m2049r/aeonwallet/XmrWalletApplication.java
@@ -14,15 +14,22 @@
 * limitations under the License.
 */

-package com.m2049r.xmrwallet.xmrto.api;
+package com.m2049r.aeonwallet;

-public interface CreateOrder {
-    Double getBtcAmount();

-    String getBtcDestAddress();
+import android.app.Application;

-    String getState();
+import com.m2049r.aeonwallet.util.Helper;

-    String getUuid();
+import timber.log.Timber;

+public class XmrWalletApplication extends Application {
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        
+        if (BuildConfig.DEBUG) {
+            Timber.plant(new Timber.DebugTree());
+        }
+    }
 }
--- a/app/src/main/java/com/m2049r/aeonwallet/data/BarcodeData.java
+++ b/app/src/main/java/com/m2049r/aeonwallet/data/BarcodeData.java
@@ -14,12 +14,11 @@
 * limitations under the License.
 */

-package com.m2049r.xmrwallet.data;
+package com.m2049r.aeonwallet.data;

 import android.net.Uri;

-import com.m2049r.xmrwallet.model.Wallet;
-import com.m2049r.xmrwallet.util.BitcoinAddressValidator;
+import com.m2049r.aeonwallet.model.Wallet;

 import java.util.HashMap;
 import java.util.Map;
@@ -27,15 +26,12 @@ import java.util.Map;
 import timber.log.Timber;

 public class BarcodeData {
-    public static final String XMR_SCHEME = "monero:";
+    public static final String XMR_SCHEME = "aeon:";
    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, BTC
+        XMR
    }

    public Asset asset = null;
@@ -43,11 +39,6 @@ public class BarcodeData {
    public String paymentId = null;
    public String amount = null;

-    public BarcodeData(String uri) {
-        this.asset = asset;
-        this.address = address;
-    }
-
    public BarcodeData(Asset asset, String address) {
        this.asset = asset;
        this.address = address;
@@ -66,31 +57,6 @@ public class BarcodeData {
        this.amount = amount;
    }

-    public Uri getUri() {
-        return Uri.parse(getUriString());
-    }
-
-    public String getUriString() {
-        if (asset != Asset.XMR) throw new IllegalStateException("We can only do XMR stuff!");
-        StringBuilder sb = new StringBuilder();
-        sb.append(BarcodeData.XMR_SCHEME).append(address);
-        boolean first = true;
-        if ((paymentId != null) && !paymentId.isEmpty()) {
-            sb.append("?");
-            first = false;
-            sb.append(BarcodeData.XMR_PAYMENTID).append('=').append(paymentId);
-        }
-        if (!amount.isEmpty()) {
-            if (first) {
-                sb.append("?");
-            } else {
-                sb.append("&");
-            }
-            sb.append(BarcodeData.XMR_AMOUNT).append('=').append(amount);
-        }
-        return sb.toString();
-    }
-
    static public BarcodeData fromQrCode(String qrCode) {
        // check for monero uri
        BarcodeData bcData = parseMoneroUri(qrCode);
@@ -98,14 +64,6 @@ 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;
    }

@@ -173,57 +131,4 @@ 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);
-    }
 }
--- a/Show More
+++ b/Show More