Rebase on monerujo 1x5x10 (#10 )

* spinner tweaks (#306) * Fix keystore null (#308) * avoid crash if input to large * avoid NPE if wallet key not found * Use FingerprintManager instead of FingerprintManagerCompat (Fix #300) (#302) * show correct amount for pending tx (#309) * accounts (#312) * Inform user the progress or result of opening wallet (#297) * Fix balance (#313) * fix length test (#314) * sweep all (#317) * French Strings updated to #297 (#316) + Missing update to #312 + enhancement on "wrapping things up" * Fixes to v1.5.5 (#318) * fix disappearing hamburger * german fixes to fit space * Layout tweaks (#319) * remove mixin settings (#320) * subaddresses (#322) * new subaddress bump effect (#327) * Update Translations (#329) * avoid NPE (#330) * fix displayed subaddress # * fix path of build script * cleanup translations & resources * include for aeon
new version
2025-09-04 00:53:36 +02:00 · 2018-06-28 07:39:05 +02:00 · 2018-06-09 14:03:30 +02:00 · 2018-06-09 12:54:49 +02:00 · 2018-06-08 22:46:41 +02:00 · 2018-06-07 19:56:45 +02:00
218 changed files with 1480 additions and 12985 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
@@ -1,34 +1,24 @@
-# Monerujo
-Another Android Monero Wallet for Monero
-	**(not
-    Monero Classic,
-    Monero-Classic,
-    Monero Zero,
-    Monero Original,
-    Monero C,
-    Monero V)**
+# MonerujoAE
+The Android AEON Wallet

 ### QUICKSTART
- Download the APK for the most current release [here](https://github.com/m2049r/xmrwallet/releases) and install it
- Alternatively add our F-Droid repo https://f-droid.monerujo.io/fdroid/repo with fingerpint ```A8 2C 68 E1 4A F0 AA 6A 2E C2 0E 6B 27 2E FF 25 E5 A0 38 F3 F6 58 84 31 6E 0F 5E 0D 91 E7 B7 13``` to your F-Droid client
+- 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://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
 - 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)
+- Advanced users can copy over synced wallet files (all files) onto sdcard in directory ```aeonwallet``` (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 Moneroj if you use this App. Be cautious when spending on the mainnet.
+You may lose all your AEON if you use this App.

 ### Random Notes
- Based off monero v0.11.1.0
- currently only android32 (runs on 64-bit as well)
- works on the testnet & mainnet
- sync is slow due to 32-bit architecture
+- Based off aeon v0.12.0
+- works on the stagenet & mainnet
 - 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
@@ -36,23 +26,14 @@ You may lose all your Moneroj if you use this App. Be cautious when spending on
 ### 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 "monerujo" folder periodically.
+- You should backup your wallet files in the "aeonwallet" folder periodically.
 - Also note, that on some devices the backups will only be visible on a PC over USB after a reboot of the device (it's an Android bug/feature)
 - Created wallets on a private testnet are unusable because the restore height is set to that
-of the "real" testnet.  After creating a new wallet, make a **new** one by recovering from the seed.
-The official monero client shows the same behaviour.
+of the "real" stagenet.  After creating a new wallet, make a **new** one by recovering from the seed.
+The official client shows the same behaviour.

 ### HOW TO BUILD
-No need to build. Binaries are included:
-
- openssl-1.0.2l
- monero-v0.12
- boost_1_58_0
-
-If you want to build them yourself (recommended) check out [the instructions](doc/BUILDING-external-libs.md)
-
-Then, fire up Android Studio and build the APK.
+Check out [the instructions](doc/BUILDING-external-libs.md)

 ### Donations
- Address: 4AdkPJoxn7JCvAby9szgnt93MSEwdnxdhaASxbTBm6x5dCwmsDep2UYN4FhStDn5i11nsJbpU7oj59ahg8gXb1Mg3viqCuk
- Viewkey: b1aff2a12191723da0afbe75516f94dd8b068215f6e847d8da57aca5f1f98e0c
+- Address: WmsfCJfmd6QQ84Rfb2mD1y7ryBzvTiQ8MMngmgRjxDMCCkeuChA9B9ZRNZyQyjgH1zdQMBXeQB9vZhUwPHmLGhyo2nMoE2ARv
--- 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
@@ -4,11 +4,11 @@ android {
    compileSdkVersion 25
    buildToolsVersion '27.0.3'
    defaultConfig {
-        applicationId "com.m2049r.xmrwallet"
+        applicationId "com.m2049r.aeonwallet"
        minSdkVersion 21
        targetSdkVersion 25
-        versionCode 111
-        versionName "1.6.1 'Nano S'"
+        versionCode 20
+        versionName "0.2.0 'Accounts RC1'"
        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 ->
--- 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" />
@@ -10,11 +10,11 @@
    <uses-permission android:name="android.permission.USE_FINGERPRINT" />

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

        <activity
@@ -28,44 +28,18 @@
            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>

-        <!--activity
-            android:name=".util.UsbEventReceiverActivity"
-            android:excludeFromRecents="true"
-            android:exported="false"
-            android:label="@string/app_name"
-            android:noHistory="true"
-            android:process=":UsbEventReceiverActivityProcess"
-            android:taskAffinity="com.m2049r.xmrwallet.taskAffinityUsbEventReceiver"
-            android:theme="@style/Theme.Transparent">
-            <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>

--- 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
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

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

 import android.content.Context;
 import android.graphics.Bitmap;
@@ -46,14 +46,13 @@ import com.google.zxing.WriterException;
 import com.google.zxing.common.BitMatrix;
 import com.google.zxing.qrcode.QRCodeWriter;
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-import com.m2049r.xmrwallet.data.BarcodeData;
-import com.m2049r.xmrwallet.ledger.LedgerProgressDialog;
-import com.m2049r.xmrwallet.model.Wallet;
-import com.m2049r.xmrwallet.model.WalletManager;
-import com.m2049r.xmrwallet.util.Helper;
-import com.m2049r.xmrwallet.util.MoneroThreadPoolExecutor;
-import com.m2049r.xmrwallet.widget.ExchangeView;
-import com.m2049r.xmrwallet.widget.Toolbar;
+import com.m2049r.aeonwallet.data.BarcodeData;
+import com.m2049r.aeonwallet.model.Wallet;
+import com.m2049r.aeonwallet.model.WalletManager;
+import com.m2049r.aeonwallet.util.Helper;
+import com.m2049r.aeonwallet.util.MoneroThreadPoolExecutor;
+import com.m2049r.aeonwallet.widget.ExchangeView;
+import com.m2049r.aeonwallet.widget.Toolbar;

 import java.util.HashMap;
 import java.util.Map;
@@ -63,6 +62,7 @@ import timber.log.Timber;
 public class ReceiveFragment extends Fragment {

    private ProgressBar pbProgress;
+    private View llAddress;
    private TextView tvAddressLabel;
    private TextView tvAddress;
    private TextInputLayout etPaymentId;
@@ -93,6 +93,7 @@ public class ReceiveFragment extends Fragment {
        View view = inflater.inflate(R.layout.fragment_receive, container, false);

        pbProgress = (ProgressBar) view.findViewById(R.id.pbProgress);
+        llAddress = view.findViewById(R.id.llAddress);
        tvAddressLabel = (TextView) view.findViewById(R.id.tvAddressLabel);
        tvAddress = (TextView) view.findViewById(R.id.tvAddress);
        etPaymentId = (TextInputLayout) view.findViewById(R.id.etPaymentId);
@@ -176,9 +177,23 @@ public class ReceiveFragment extends Fragment {
                enableSubaddressButton(false);
                enableCopyAddress(false);

+                final Runnable resetSize = new Runnable() {
+                    public void run() {
+                        tvAddress.animate().setDuration(125).scaleX(1).scaleY(1).start();
+                    }
+                };
+
                final Runnable newAddress = new Runnable() {
                    public void run() {
-                        getNewSubaddress();
+                        tvAddress.setText(wallet.getNewSubaddress());
+                        tvAddressLabel.setText(getString(R.string.generate_address_label_sub,
+                                wallet.getNumSubaddresses() - 1));
+                        storeWallet();
+                        generateQr();
+                        enableCopyAddress(true);
+                        tvAddress.animate().alpha(1).setDuration(125)
+                                .scaleX(1.2f).scaleY(1.2f)
+                                .withEndAction(resetSize).start();
                    }
                };

@@ -300,39 +315,18 @@ public class ReceiveFragment extends Fragment {
    }

    private void loadAndShow(String walletPath, String password) {
-        new AsyncShow(walletPath, password).executeOnExecutor(MoneroThreadPoolExecutor.MONERO_THREAD_POOL_EXECUTOR);
+        new AsyncShow().executeOnExecutor(MoneroThreadPoolExecutor.MONERO_THREAD_POOL_EXECUTOR,
+                walletPath, password);
    }

-    GenerateReviewFragment.ProgressListener progressCallback = null;
-
-    private class AsyncShow extends AsyncTask<Void, Void, Boolean> {
-        final private String walletPath;
-        final private String password;
-
-
-        AsyncShow(String walletPath, String passsword) {
-            super();
-            this.walletPath = walletPath;
-            this.password = passsword;
-        }
-
-        boolean dialogOpened = false;
+    private class AsyncShow extends AsyncTask<String, Void, Boolean> {
+        String password;

        @Override
-        protected void onPreExecute() {
-            super.onPreExecute();
-            showProgress();
-            if ((walletPath != null)
-                    && (WalletManager.getInstance().queryWalletHardware(walletPath + ".keys", password) == 1)
-                    && (progressCallback != null)) {
-                progressCallback.showLedgerProgressDialog(LedgerProgressDialog.TYPE_RESTORE);
-                dialogOpened = true;
-            }
-        }
-
-        @Override
-        protected Boolean doInBackground(Void... params) {
-            if (params.length != 0) return false;
+        protected Boolean doInBackground(String... params) {
+            if (params.length != 2) return false;
+            String walletPath = params[0];
+            password = params[1];
            wallet = WalletManager.getInstance().openWallet(walletPath, password);
            isMyWallet = true;
            return true;
@@ -341,8 +335,6 @@ public class ReceiveFragment extends Fragment {
        @Override
        protected void onPostExecute(Boolean result) {
            super.onPostExecute(result);
-            if (dialogOpened)
-                progressCallback.dismissProgressDialog();
            if (!isAdded()) return; // never mind
            if (result) {
                show();
@@ -479,7 +471,7 @@ public class ReceiveFragment extends Fragment {

    private Bitmap getMoneroLogo() {
        if (logo == null) {
-            logo = Helper.getBitmap(getContext(), R.drawable.ic_monero_logo_b);
+            logo = Helper.getBitmap(getContext(), R.mipmap.ic_launcher);
        }
        return logo;
    }
@@ -503,10 +495,6 @@ public class ReceiveFragment extends Fragment {
            throw new ClassCastException(context.toString()
                    + " must implement Listener");
        }
-        if (context instanceof GenerateReviewFragment.ProgressListener) {
-            this.progressCallback = (GenerateReviewFragment.ProgressListener) context;
-        }
-
    }

    @Override
@@ -525,51 +513,4 @@ public class ReceiveFragment extends Fragment {
        }
        super.onDetach();
    }
-
-    private void getNewSubaddress() {
-        new AsyncSubaddress().executeOnExecutor(MoneroThreadPoolExecutor.MONERO_THREAD_POOL_EXECUTOR);
-    }
-
-    private class AsyncSubaddress extends AsyncTask<Void, Void, Boolean> {
-        private String newSubaddress;
-
-        boolean dialogOpened = false;
-
-        @Override
-        protected void onPreExecute() {
-            super.onPreExecute();
-            if (wallet.isKeyOnDevice() && (progressCallback != null)) {
-                progressCallback.showLedgerProgressDialog(LedgerProgressDialog.TYPE_SUBADDRESS);
-                dialogOpened = true;
-            }
-        }
-
-        @Override
-        protected Boolean doInBackground(Void... params) {
-            if (params.length != 0) return false;
-            newSubaddress = wallet.getNewSubaddress();
-            storeWallet();
-            return true;
-        }
-
-        @Override
-        protected void onPostExecute(Boolean result) {
-            super.onPostExecute(result);
-            if (dialogOpened)
-                progressCallback.dismissProgressDialog();
-            tvAddress.setText(newSubaddress);
-            tvAddressLabel.setText(getString(R.string.generate_address_label_sub,
-                    wallet.getNumSubaddresses() - 1));
-            generateQr();
-            enableCopyAddress(true);
-            final Runnable resetSize = new Runnable() {
-                public void run() {
-                    tvAddress.animate().setDuration(125).scaleX(1).scaleY(1).start();
-                }
-            };
-            tvAddress.animate().alpha(1).setDuration(125)
-                    .scaleX(1.2f).scaleY(1.2f)
-                    .withEndAction(resetSize).start();
-        }
-    }
 }
--- 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;
@@ -72,23 +70,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);
@@ -115,14 +102,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);
@@ -295,21 +274,8 @@ public class TxFragment extends Fragment {
        tvTxTransfers.setText(sb.toString());
        tvDestination.setText(dstSb.toString());
        this.info = info;
-        showBtcInfo();
    }

-    void showBtcInfo() {
-        if (userNotes.xmrtoKey != null) {
-            cvXmrTo.setVisibility(View.VISIBLE);
-            tvTxXmrToKey.setText(userNotes.xmrtoKey);
-            tvDestinationBtc.setText(userNotes.xmrtoDestination);
-            tvTxAmountBtc.setText(userNotes.xmrtoAmount + " BTC");
-        } else {
-            cvXmrTo.setVisibility(View.GONE);
-        }
-    }
-
-
    @Override
    public void onCreate(@Nullable Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
--- a/app/src/main/java/com/m2049r/aeonwallet/WalletActivity.java
+++ b/app/src/main/java/com/m2049r/aeonwallet/WalletActivity.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

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

 import android.app.AlertDialog;
 import android.content.ComponentName;
@@ -24,7 +24,6 @@ import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.PowerManager;
@@ -46,29 +45,27 @@ import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;

-import com.m2049r.xmrwallet.data.BarcodeData;
-import com.m2049r.xmrwallet.data.TxData;
-import com.m2049r.xmrwallet.dialog.CreditsFragment;
-import com.m2049r.xmrwallet.dialog.HelpFragment;
-import com.m2049r.xmrwallet.fragment.send.SendAddressWizardFragment;
-import com.m2049r.xmrwallet.fragment.send.SendFragment;
-import com.m2049r.xmrwallet.ledger.LedgerProgressDialog;
-import com.m2049r.xmrwallet.model.PendingTransaction;
-import com.m2049r.xmrwallet.model.TransactionInfo;
-import com.m2049r.xmrwallet.model.Wallet;
-import com.m2049r.xmrwallet.model.WalletManager;
-import com.m2049r.xmrwallet.service.WalletService;
-import com.m2049r.xmrwallet.util.Helper;
-import com.m2049r.xmrwallet.util.MoneroThreadPoolExecutor;
-import com.m2049r.xmrwallet.util.UserNotes;
-import com.m2049r.xmrwallet.widget.Toolbar;
+import com.m2049r.aeonwallet.data.BarcodeData;
+import com.m2049r.aeonwallet.data.TxData;
+import com.m2049r.aeonwallet.dialog.CreditsFragment;
+import com.m2049r.aeonwallet.dialog.HelpFragment;
+import com.m2049r.aeonwallet.fragment.send.SendAddressWizardFragment;
+import com.m2049r.aeonwallet.fragment.send.SendFragment;
+import com.m2049r.aeonwallet.model.PendingTransaction;
+import com.m2049r.aeonwallet.model.TransactionInfo;
+import com.m2049r.aeonwallet.model.Wallet;
+import com.m2049r.aeonwallet.model.WalletManager;
+import com.m2049r.aeonwallet.service.WalletService;
+import com.m2049r.aeonwallet.util.Helper;
+import com.m2049r.aeonwallet.util.UserNotes;
+import com.m2049r.aeonwallet.widget.Toolbar;

 import java.util.ArrayList;
 import java.util.List;

 import timber.log.Timber;

-public class WalletActivity extends BaseActivity implements WalletFragment.Listener,
+public class WalletActivity extends SecureActivity implements WalletFragment.Listener,
        WalletService.Observer, SendFragment.Listener, TxFragment.Listener,
        GenerateReviewFragment.ListenerWithWallet,
        GenerateReviewFragment.Listener,
@@ -314,10 +311,10 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
                toolbar.setBackgroundResource(R.drawable.backgound_toolbar_mainnet);
                break;
            case NetworkType_Testnet:
-                toolbar.setBackgroundResource(R.color.colorPrimaryDark);
+                toolbar.setBackgroundResource(R.color.give);
                break;
            case NetworkType_Stagenet:
-                toolbar.setBackgroundResource(R.color.colorPrimaryDark);
+                toolbar.setBackgroundResource(R.color.give);
                break;
            default:
                throw new IllegalStateException("Unsupported Network: " + WalletManager.getInstance().getNetworkType());
@@ -400,6 +397,28 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
        Timber.d("onResume()");
    }

+    private PowerManager.WakeLock wl = null;
+
+    void acquireWakeLock() {
+        if ((wl != null) && wl.isHeld()) return;
+        PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+        this.wl = pm.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK, getString(R.string.app_name));
+        try {
+            wl.acquire();
+            Timber.d("WakeLock acquired");
+        } catch (SecurityException ex) {
+            Timber.w("WakeLock NOT acquired: %s", ex.getLocalizedMessage());
+            wl = null;
+        }
+    }
+
+    public void releaseWakeLock() {
+        if ((wl == null) || !wl.isHeld()) return;
+        wl.release();
+        wl = null;
+        Timber.d("WakeLock released");
+    }
+
    public void saveWallet() {
        if (mIsBound) { // no point in talking to unbound service
            Intent intent = new Intent(getApplicationContext(), WalletService.class);
@@ -484,7 +503,7 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
                    getSupportFragmentManager().findFragmentByTag(WalletFragment.class.getName());
            if (wallet.isSynchronized()) {
                Timber.d("onRefreshed() synced");
-                releaseWakeLock(RELEASE_WAKE_LOCK_DELAY); // the idea is to stay awake until synced
+                releaseWakeLock(); // the idea is to stay awake until synced
                if (!synced) { // first sync
                    onProgress(-1);
                    saveWallet(); // save on first sync
@@ -525,21 +544,10 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste

    boolean haveWallet = false;

-    @Override
-    public void onWalletOpen(final int hardware) {
-        if (hardware > 0)
-            runOnUiThread(new Runnable() {
-                public void run() {
-                    showLedgerProgressDialog(LedgerProgressDialog.TYPE_RESTORE);
-                }
-            });
-    }
-
    @Override
    public void onWalletStarted(final boolean success) {
        runOnUiThread(new Runnable() {
            public void run() {
-                dismissProgressDialog();
                if (!success) {
                    Toast.makeText(WalletActivity.this, getString(R.string.status_wallet_connect_failed), Toast.LENGTH_LONG).show();
                }
@@ -570,7 +578,6 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
                    getSupportFragmentManager().findFragmentById(R.id.fragment_container);
            runOnUiThread(new Runnable() {
                public void run() {
-                    dismissProgressDialog();
                    PendingTransaction.Status status = pendingTransaction.getStatus();
                    if (status != PendingTransaction.Status.Status_Ok) {
                        String errorText = pendingTransaction.getErrorString();
@@ -726,8 +733,6 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
            intent.putExtra(WalletService.REQUEST_CMD_TX_TAG, tag);
            startService(intent);
            Timber.d("CREATE TX request sent");
-            if (getWallet().isKeyOnDevice())
-                showLedgerProgressDialog(LedgerProgressDialog.TYPE_SEND);
        } else {
            Timber.e("Service not bound");
        }
@@ -1044,7 +1049,12 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
        final int id = item.getItemId();
        switch (id) {
            case R.id.account_new:
-                addAccount();
+                getWallet().addAccount();
+                int newIdx = getWallet().getNumAccounts() - 1;
+                getWallet().setAccountIndex(newIdx);
+                Toast.makeText(this,
+                        getString(R.string.accounts_new, newIdx),
+                        Toast.LENGTH_SHORT).show();
                break;
            default:
                Timber.d("NavigationDrawer ID=%d", id);
@@ -1053,49 +1063,9 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
                    Timber.d("found @%d", accountIdx);
                    getWallet().setAccountIndex(accountIdx);
                }
-                forceUpdate();
-                drawer.closeDrawer(GravityCompat.START);
        }
+        forceUpdate();
+        drawer.closeDrawer(GravityCompat.START);
        return true;
    }
-
-    private void addAccount() {
-        new AsyncAddAccount().executeOnExecutor(MoneroThreadPoolExecutor.MONERO_THREAD_POOL_EXECUTOR);
-    }
-
-    private class AsyncAddAccount extends AsyncTask<Void, Void, Boolean> {
-        boolean dialogOpened = false;
-
-        @Override
-        protected void onPreExecute() {
-            super.onPreExecute();
-            if (getWallet().isKeyOnDevice()) {
-                showLedgerProgressDialog(LedgerProgressDialog.TYPE_ACCOUNT);
-                dialogOpened = true;
-            } else {
-                showProgressDialog(R.string.accounts_progress_new);
-                dialogOpened = true;
-            }
-        }
-
-        @Override
-        protected Boolean doInBackground(Void... params) {
-            if (params.length != 0) return false;
-            getWallet().addAccount();
-            getWallet().setAccountIndex(getWallet().getNumAccounts() - 1);
-            return true;
-        }
-
-        @Override
-        protected void onPostExecute(Boolean result) {
-            super.onPostExecute(result);
-            forceUpdate();
-            drawer.closeDrawer(GravityCompat.START);
-            if (dialogOpened)
-                dismissProgressDialog();
-            Toast.makeText(WalletActivity.this,
-                    getString(R.string.accounts_new, getWallet().getNumAccounts() - 1),
-                    Toast.LENGTH_SHORT).show();
-        }
-    }
 }
--- 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,14 @@ 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.util.Helper;
+import com.m2049r.aeonwallet.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 XMR");
+            Timber.e("Not AEON");
            sCurrency.setSelection(0, true);
            balanceCurrency = Helper.CRYPTO;
            balanceRate = 1.0;
@@ -271,7 +271,7 @@ public class WalletFragment extends Fragment
            bSend.setVisibility(View.VISIBLE);
            bSend.setEnabled(true);
        }
-        if (isVisible()) enableAccountsList(true); //otherwise it is enabled in onResume()
+        enableAccountsList(true);
    }

    boolean walletLoaded = false;
--- a/app/src/main/java/com/m2049r/xmrwallet/xmrto/network/NetworkCallback.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/xmrto/network/NetworkCallback.java
@@ -14,14 +14,22 @@
 * limitations under the License.
 */

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

-import org.json.JSONObject;

-interface NetworkCallback {
+import android.app.Application;

-    void onSuccess(JSONObject jsonObject);
+import com.m2049r.aeonwallet.util.Helper;

-    void onError(Exception ex);
+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,14 +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.NetworkType;
-import com.m2049r.xmrwallet.model.Wallet;
-import com.m2049r.xmrwallet.model.WalletManager;
-import com.m2049r.xmrwallet.util.BitcoinAddressValidator;
+import com.m2049r.aeonwallet.model.Wallet;

 import java.util.HashMap;
 import java.util.Map;
@@ -29,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;
@@ -70,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;
    }

@@ -145,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
Author	SHA1	Message	Date
m2049r	137a3a3ddc	Rebase on monerujo 1x5x10 (#10 ) * spinner tweaks (#306) * Fix keystore null (#308) * avoid crash if input to large * avoid NPE if wallet key not found * Use FingerprintManager instead of FingerprintManagerCompat (Fix #300) (#302) * show correct amount for pending tx (#309) * accounts (#312) * Inform user the progress or result of opening wallet (#297) * Fix balance (#313) * fix length test (#314) * sweep all (#317) * French Strings updated to #297 (#316) + Missing update to #312 + enhancement on "wrapping things up" * Fixes to v1.5.5 (#318) * fix disappearing hamburger * german fixes to fit space * Layout tweaks (#319) * remove mixin settings (#320) * subaddresses (#322) * new subaddress bump effect (#327) * Update Translations (#329) * avoid NPE (#330) * fix displayed subaddress # * fix path of build script * cleanup translations & resources * include for aeon	2018-06-28 07:39:05 +02:00
m2049r	67f24673b1	new version	2018-06-09 14:03:30 +02:00
m2049r	1b9aac7526	Fix spinners (#5 )	2018-06-09 12:54:49 +02:00
m2049r	b68c425bae	update gradle version	2018-06-08 22:46:41 +02:00
m2049r	cf58072c6c	new verion 0.1.1	2018-06-07 19:56:45 +02:00
m2049r	6960347014	tweak colours (#4 )	2018-06-07 19:05:17 +02:00
m2049r	cc5a8969d6	Use coinmarketcap for exchange rates (#3 )	2018-06-07 18:45:44 +02:00
m2049r	c0ebf6c318	Remove xmr.to refrences (#2 )	2018-06-07 18:29:43 +02:00
m2049r	4aa46d8cf9	AEON (#1 )	2018-06-04 21:52:04 +02:00