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

.idea/.gitignore

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

.idea/.name

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

.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>

.idea/copyright/profiles_settings.xml

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

.idea/modules.xml

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

README.md

@@ -1,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

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})
 

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 94
-        versionName "1.5.4 'CrAzY Nacho'"
+        versionCode 20
+        versionName "0.2.0 'Accounts RC1'"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {

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

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

app/src/main/AndroidManifest.xml

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

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

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;
 
@@ -407,7 +407,8 @@ public class GenerateFragment extends Fragment {
 
     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 {

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,14 +43,14 @@ import android.widget.Switch;
 import android.widget.TextView;
 import android.widget.Toast;
 
-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;
 

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

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

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;
@@ -266,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());
         }
@@ -368,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.xmr-tw.org";
+    private static final String PREF_DAEMONLIST_STAGENET = "aeon.monerujo.io";
 
     private NodeList daemonStageNet;
     private NodeList daemonMainNet;

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();

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;

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

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

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,6 +57,7 @@ public class TxFragment extends Fragment {
         TS_FORMATTER.setTimeZone(tz);
     }
 
+    private TextView tvAccount;
     private TextView tvTxTimestamp;
     private TextView tvTxId;
     private TextView tvTxKey;
@@ -71,23 +70,13 @@ 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);
@@ -113,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);
@@ -222,6 +203,8 @@ 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);
@@ -236,9 +219,6 @@ 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)) {
@@ -286,26 +266,16 @@ public class TxFragment extends Fragment {
             }
         } else {
             sb.append("-");
-            dstSb.append(info.direction == TransactionInfo.Direction.Direction_In ? activityCallback.getWalletAddress() : "-");
+            dstSb.append(info.direction ==
+                    TransactionInfo.Direction.Direction_In ?
+                    activityCallback.getWalletSubaddress(info.account, info.subaddress) :
+                    "-");
         }
         tvTxTransfers.setText(sb.toString());
         tvDestination.setText(dstSb.toString());
         this.info = info;
-        showBtcInfo();
     }
 
-    void showBtcInfo() {
-        if (userNotes.xmrtoKey != null) {
-            cvXmrTo.setVisibility(View.VISIBLE);
-            tvTxXmrToKey.setText(userNotes.xmrtoKey);
-            tvDestinationBtc.setText(userNotes.xmrtoDestination);
-            tvTxAmountBtc.setText(userNotes.xmrtoAmount + " BTC");
-        } else {
-            cvXmrTo.setVisibility(View.GONE);
-        }
-    }
-
-
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -321,7 +291,7 @@ public class TxFragment extends Fragment {
     Listener activityCallback;
 
     public interface Listener {
-        String getWalletAddress();
+        String getWalletSubaddress(int accountIndex, int subaddressIndex);
 
         String getTxKey(String hash);
 

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,16 +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.service.exchange.kraken.ExchangeApiImpl;
-import com.m2049r.xmrwallet.util.Helper;
-import com.m2049r.xmrwallet.util.OkHttpClientSingleton;
-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;
@@ -101,7 +99,9 @@ public class WalletFragment extends Fragment
         ivSynced = (ImageView) view.findViewById(R.id.ivSynced);
 
         sCurrency = (Spinner) view.findViewById(R.id.sCurrency);
-        sCurrency.setAdapter(ArrayAdapter.createFromResource(getContext(), R.array.currency, R.layout.item_spinner_balance));
+        ArrayAdapter currencyAdapter = ArrayAdapter.createFromResource(getContext(), R.array.currency, R.layout.item_spinner_balance);
+        currencyAdapter.setDropDownViewResource(R.layout.item_spinner_dropdown_item);
+        sCurrency.setAdapter(currencyAdapter);
 
         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 (!"XMR".equals(balanceCurrency)) { // not XMR
+        if (!Helper.CRYPTO.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 = "XMR";
+    String balanceCurrency = Helper.CRYPTO;
     double balanceRate = 1.0;
 
-    private final ExchangeApi exchangeApi = new ExchangeApiImpl(OkHttpClientSingleton.getOkHttpClient());
+    private final ExchangeApi exchangeApi = Helper.getExchangeApi();
 
     void refreshBalance() {
         if (sCurrency.getSelectedItemPosition() == 0) { // XMR
@@ -170,9 +170,10 @@ 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("XMR", currency,
+                exchangeApi.queryExchangeRate(Helper.CRYPTO, currency,
                         new ExchangeCallback() {
                             @Override
                             public void onSuccess(final ExchangeRate exchangeRate) {
@@ -228,10 +229,10 @@ public class WalletFragment extends Fragment
 
     public void exchange(final ExchangeRate exchangeRate) {
         hideExchanging();
-        if (!"XMR".equals(exchangeRate.getBaseCurrency())) {
-            Timber.e("Not XMR");
+        if (!Helper.CRYPTO.equals(exchangeRate.getBaseCurrency())) {
+            Timber.e("Not AEON");
             sCurrency.setSelection(0, true);
-            balanceCurrency = "XMR";
+            balanceCurrency = Helper.CRYPTO;
             balanceRate = 1.0;
         } else {
             int spinnerPosition = ((ArrayAdapter) sCurrency.getAdapter()).getPosition(exchangeRate.getQuoteCurrency());
@@ -256,7 +257,7 @@ public class WalletFragment extends Fragment
     // called from activity
 
     public void onRefreshed(final Wallet wallet, final boolean full) {
-        Timber.d("onRefreshed()");
+        Timber.d("onRefreshed(%b)", full);
         if (full) {
             List<TransactionInfo> list = wallet.getHistory().getAll();
             adapter.setInfos(list);
@@ -270,6 +271,7 @@ public class WalletFragment extends Fragment
             bSend.setVisibility(View.VISIBLE);
             bSend.setEnabled(true);
         }
+        enableAccountsList(true);
     }
 
     boolean walletLoaded = false;
@@ -313,7 +315,7 @@ public class WalletFragment extends Fragment
         if (wallet == null) return;
         walletTitle = wallet.getName();
         String watchOnly = (wallet.isWatchOnly() ? getString(R.string.label_watchonly) : "");
-        walletSubtitle = wallet.getAddress().substring(0, 10) + "…" + watchOnly;
+        walletSubtitle = wallet.getAccountLabel();
         activityCallback.setTitle(walletTitle, walletSubtitle);
         Timber.d("wallet title is %s", walletTitle);
     }
@@ -323,10 +325,13 @@ 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) {
+        if ((walletTitle == null) || (accountIdx != wallet.getAccountIndex())) {
+            accountIdx = wallet.getAccountIndex();
             setActivityTitle(wallet);
         }
         long balance = wallet.getBalance();
@@ -412,9 +417,28 @@ public class WalletFragment extends Fragment
         super.onResume();
         Timber.d("onResume()");
         activityCallback.setTitle(walletTitle, walletSubtitle);
-        activityCallback.setToolbarButton(Toolbar.BUTTON_CLOSE);
+        //activityCallback.setToolbarButton(Toolbar.BUTTON_CLOSE); // TODO: Close button somewhere else
+        activityCallback.setToolbarButton(Toolbar.BUTTON_NONE);
         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);
+        }
+    }
+
 }

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

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

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);
-    }
 }

app/src/main/java/com/m2049r/aeonwallet/data/PendingTx.java

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

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

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

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

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

app/src/main/java/com/m2049r/aeonwallet/dialog/AboutFragment.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.m2049r.xmrwallet.dialog;
+package com.m2049r.aeonwallet.dialog;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -29,8 +29,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
 
-import com.m2049r.xmrwallet.BuildConfig;
-import com.m2049r.xmrwallet.R;
+import com.m2049r.aeonwallet.BuildConfig;
+import com.m2049r.aeonwallet.R;
 
 public class AboutFragment extends DialogFragment {
     static final String TAG = "AboutFragment";

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.m2049r.xmrwallet.dialog;
+package com.m2049r.aeonwallet.dialog;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -28,8 +28,10 @@ import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
+import android.widget.Toast;
 
-import com.m2049r.xmrwallet.R;
+import com.m2049r.aeonwallet.R;
+import com.m2049r.aeonwallet.util.Helper;
 
 public class CreditsFragment extends DialogFragment {
     static final String TAG = "DonationFragment";
@@ -54,6 +56,16 @@ public class CreditsFragment extends DialogFragment {
 
         ((TextView) view.findViewById(R.id.tvCredits)).setText(Html.fromHtml(getString(R.string.credits_text)));
 
+        (view.findViewById(R.id.bCopyAddress)).
+                setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        Helper.clipBoardCopy(getActivity(), getString(R.string.label_copy_address),
+                                ((TextView) view.findViewById(R.id.tvWalletAddress)).getText().toString());
+                        Toast.makeText(getActivity(), getString(R.string.message_copy_donation), Toast.LENGTH_SHORT).show();
+                    }
+                });
+
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         builder.setView(view);
         builder.setNegativeButton(R.string.about_close,
@@ -65,5 +77,4 @@ public class CreditsFragment extends DialogFragment {
                 });
 
         return builder.create();
-    }
-}
+    }}

app/src/main/java/com/m2049r/aeonwallet/dialog/HelpFragment.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.m2049r.xmrwallet.dialog;
+package com.m2049r.aeonwallet.dialog;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -29,7 +29,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
 
-import com.m2049r.xmrwallet.R;
+import com.m2049r.aeonwallet.R;
 
 public class HelpFragment extends DialogFragment {
     static final String TAG = "HelpFragment";