added info about xmr..to

* Update help.xml

.gitignore

@@ -7,3 +7,4 @@
 /captures
 .externalNativeBuild
 .DS_Store
+/app/release

.idea/libraries/constraint_layout_1_0_2.xml

@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="constraint-layout-1.0.2">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.android/build-cache/983cd9976ef510b2538361561f2ee91f1200f245/output/res" />
-      <root url="jar://$USER_HOME$/.android/build-cache/983cd9976ef510b2538361561f2ee91f1200f245/output/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

.idea/libraries/constraint_layout_solver_1_0_2.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="constraint-layout-solver-1.0.2">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/Sdk/extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.2/constraint-layout-solver-1.0.2.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

.idea/libraries/core_1_9_8.xml

@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="core-1.9.8">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/db7eb580bfa6467818ef12c5f1fa42273b50aa3a/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/db7eb580bfa6467818ef12c5f1fa42273b50aa3a/output/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

.idea/libraries/core_3_3_0.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="core-3.3.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.zxing/core/3.3.0/73c49077166faa4c3c0059c5f583d1d7bd1475fe/core-3.3.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.zxing/core/3.3.0/39d966e052e28fc7d83793b02e0af97ccf955745/core-3.3.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/zxing_1_9_8.xml

@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="zxing-1.9.8">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/8d8f2e0e10c7af73321454f6fa481e8e5438e654/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/8d8f2e0e10c7af73321454f6fa481e8e5438e654/output/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

README.md

@@ -11,23 +11,19 @@ Another Android Monero Wallet
 You may lose all your Moneroj if you use this App. Be cautious when spending on the mainnet.
 
 ### Random Notes
-- Based off monero v0.11.0.0 with PR #2289 applied
+- Based off monero v0.11.1.0
 - currently only android32 (runs on 64-bit as well)
 - works on the testnet & mainnet
 - sync is slow due to 32-bit architecture
 - use your own daemon - it's easy
 - screen stays on until first sync is complete
-- saves wallet only on first sync and when sending transactions or editing notes
 - Monerujo means "Monero Wallet" according to https://www.reddit.com/r/Monero/comments/3exy7t/esperanto_corner/
 
 ### TODO
-- review visibility of methods/classes
-- more sensible error dialogs
+- see taiga.getmonero.org & issues on github
 
 ### Issues / Pitfalls
-- The backups folder is now called "backups" and not ".backups" - which in most file explorers was a hidden folder
-- Wallets are now created directly in the "monerujo" folder, and not in the ".new" folder as before
-- You may want to check the old folders with a file browsing app and delete the ".new" and ".backups" folders AFTER moving neccessary wallet files to the new locations. Or simply make new backups from within Monerujo.
+- You should backup your wallet files in the "monerujo" folder periodically.
 - Also note, that on some devices the backups will only be visible on a PC over USB after a reboot of the device (it's an Android bug/feature)
 - Created wallets on a private testnet are unusable because the restore height is set to that
 of the "real" testnet.  After creating a new wallet, make a **new** one by recovering from the seed.
@@ -37,7 +33,7 @@ The official monero client shows the same behaviour.
 No need to build. Binaries are included:
 
 - openssl-1.0.2l
-- monero-v0.11.0.0 + pull requests #2289
+- monero-v0.11.1.0
 - boost_1_64_0
 
 If you want to build them yourself (recommended) check out [the instructions](doc/BUILDING-external-libs.md)

app/build.gradle

@@ -3,13 +3,13 @@ apply plugin: 'witness'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion '26.0.2'
     defaultConfig {
         applicationId "com.m2049r.xmrwallet"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 24
-        versionName "1.0.1"
+        versionCode 65
+        versionName "1.3.5 'Satoshis Dream'"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
@@ -43,28 +43,39 @@ dependencies {
     compile 'com.android.support:cardview-v7:25.4.0'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     compile 'me.dm7.barcodescanner:zxing:1.9.8'
+
+    compile "com.squareup.okhttp3:okhttp:$rootProject.ext.okHttpVersion"
+    compile "com.jakewharton.timber:timber:$rootProject.ext.timberVersion"
+
+    testCompile "junit:junit:$rootProject.ext.junitVersion"
+    testCompile "org.mockito:mockito-all:$rootProject.ext.mockitoVersion"
+    testCompile "com.squareup.okhttp3:mockwebserver:$rootProject.ext.okHttpVersion"
+    testCompile 'org.json:json:20140107'
+    testCompile 'net.jodah:concurrentunit:0.4.2'
 }
 
 dependencyVerification {
     verify = [
-            'com.android.support:appcompat-v7:70551e62660db15b790c5275f56b9de4dd9407d1494d07c8f3dd5698f3638677',
             'com.android.support:design:3f409bf2019967ffc344cfaf11e52131fac982468a1707aaeb25bf3c52838966',
+            'com.android.support:appcompat-v7:70551e62660db15b790c5275f56b9de4dd9407d1494d07c8f3dd5698f3638677',
+            'com.android.support:transition:848270144fb180efd2bf928a00ed176dbbc5290badfd638390ffba90088df8b3',
+            'me.dm7.barcodescanner:zxing:d43973c9527c23fa8e6d338c6a2c458e373ce1ac6bcaa3bc41d11ae49116000d',
+            'me.dm7.barcodescanner:core:a5c8a704089b58029db166172ed8e55d756877d010a85a0b1c94fdc96ffb8f9a',
             'com.android.support:support-v4:ee44c481a1f4d6978568e223e8125379b52b2ececdd53450e09ebae144bd377d',
             'com.android.support:recyclerview-v7:a2fe121f9d01ed8980e97095b4a3fe9700a0aa0a7d4b0f8c594f765ad8455a0d',
             'com.android.support:cardview-v7:f3fbbe1fcfdbec7333c6a2c516c5fd511a909d1975271818e268d6fe297d8c70',
             'com.android.support.constraint:constraint-layout:b0c688cc2b7172608f8153a689d746da40f71e52d7e2fe2bfd9df2f92db77085',
-            'me.dm7.barcodescanner:zxing:d43973c9527c23fa8e6d338c6a2c458e373ce1ac6bcaa3bc41d11ae49116000d',
-            'com.android.support:support-annotations:a774272036941b4e912eb426d70c848bde7f06a3bf5fb491f75a427dc6595270',
-            'com.android.support:support-vector-drawable:077009d13882ee96f061e4bc2dbe7cce7ae1762d8297592a787ff741afbfb1f2',
             'com.android.support:animated-vector-drawable:628ab1d56a6ee4cbedf32617af8b2a1fe02964ed0628e8f898cc09ddba6e1835',
-            'com.android.support:transition:848270144fb180efd2bf928a00ed176dbbc5290badfd638390ffba90088df8b3',
-            'com.android.support:support-compat:54019c63614ce08b02d7b9605490cd2b29ba5b2505f394a9517450b5f72b30ca',
+            'com.android.support:support-vector-drawable:077009d13882ee96f061e4bc2dbe7cce7ae1762d8297592a787ff741afbfb1f2',
+            'com.android.support:support-fragment:316d35d4d2d2902057efad104a73e4bdb50bee260a7075678185b8cd71170945',
+            'com.android.support:support-core-ui:e72ae29b823889686cff6fcb948d6745c2baf6d4c2af4fdffa1ec1e42e3833a3',
             'com.android.support:support-media-compat:566a161d9cb0083ef62a53e46b71ce5b3d455b8635b1a0a4ae28d96d4b583de8',
             'com.android.support:support-core-utils:34b8437dfa95ff28d29cf57ffa3b1354a9fa9bfe4059f0fd5ce2f5e4326a1748',
-            'com.android.support:support-core-ui:e72ae29b823889686cff6fcb948d6745c2baf6d4c2af4fdffa1ec1e42e3833a3',
-            'com.android.support:support-fragment:316d35d4d2d2902057efad104a73e4bdb50bee260a7075678185b8cd71170945',
+            'com.android.support:support-compat:54019c63614ce08b02d7b9605490cd2b29ba5b2505f394a9517450b5f72b30ca',
+            'com.android.support:support-annotations:a774272036941b4e912eb426d70c848bde7f06a3bf5fb491f75a427dc6595270',
             'com.android.support.constraint:constraint-layout-solver:8c62525a9bc5cff5633a96cb9b32fffeccaf41b8841aa87fc22607070dea9b8d',
-            'me.dm7.barcodescanner:core:a5c8a704089b58029db166172ed8e55d756877d010a85a0b1c94fdc96ffb8f9a',
             'com.google.zxing:core:bba7724e02a997cec38213af77133ee8e24b0d5cf5fa7ecbc16a4fa93f11ee0d',
+            'com.squareup.okio:okio:734269c3ebc5090e3b23566db558f421f0b4027277c79ad5d176b8ec168bb850',
+            'com.squareup.okhttp3:okhttp:7265adbd6f028aade307f58569d814835cd02bc9beffb70c25f72c9de50d61c4',
     ]
 }

app/src/main/AndroidManifest.xml

@@ -13,6 +13,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
+        android:name=".XmrWalletApplication"
         android:theme="@style/MyMaterialTheme">
 
         <activity

app/src/main/cpp/monerujo.cpp

@@ -215,7 +215,7 @@ std::vector<std::string> java2cpp(JNIEnv *env, jobject arrayList) {
     for (jint i = 0; i < len; i++) {
         jstring element = static_cast<jstring>(env->CallObjectMethod(arrayList,
                                                                      java_util_ArrayList_get, i));
-        const char *pchars = env->GetStringUTFChars(element, JNI_FALSE);
+        const char *pchars = env->GetStringUTFChars(element, NULL);
         result.emplace_back(pchars);
         env->ReleaseStringUTFChars(element, pchars);
         env->DeleteLocalRef(element);
@@ -254,9 +254,9 @@ Java_com_m2049r_xmrwallet_model_WalletManager_createWalletJ(JNIEnv *env, jobject
                                                             jstring path, jstring password,
                                                             jstring language,
                                                             jboolean isTestNet) {
-    const char *_path = env->GetStringUTFChars(path, JNI_FALSE);
-    const char *_password = env->GetStringUTFChars(password, JNI_FALSE);
-    const char *_language = env->GetStringUTFChars(language, JNI_FALSE);
+    const char *_path = env->GetStringUTFChars(path, NULL);
+    const char *_password = env->GetStringUTFChars(password, NULL);
+    const char *_language = env->GetStringUTFChars(language, NULL);
 
     Bitmonero::Wallet *wallet =
             Bitmonero::WalletManagerFactory::getWalletManager()->createWallet(
@@ -275,8 +275,8 @@ JNIEXPORT jlong JNICALL
 Java_com_m2049r_xmrwallet_model_WalletManager_openWalletJ(JNIEnv *env, jobject instance,
                                                           jstring path, jstring password,
                                                           jboolean isTestNet) {
-    const char *_path = env->GetStringUTFChars(path, JNI_FALSE);
-    const char *_password = env->GetStringUTFChars(password, JNI_FALSE);
+    const char *_path = env->GetStringUTFChars(path, NULL);
+    const char *_password = env->GetStringUTFChars(password, NULL);
 
     Bitmonero::Wallet *wallet =
             Bitmonero::WalletManagerFactory::getWalletManager()->openWallet(
@@ -294,8 +294,8 @@ Java_com_m2049r_xmrwallet_model_WalletManager_recoveryWalletJ(JNIEnv *env, jobje
                                                               jstring path, jstring mnemonic,
                                                               jboolean isTestNet,
                                                               jlong restoreHeight) {
-    const char *_path = env->GetStringUTFChars(path, JNI_FALSE);
-    const char *_mnemonic = env->GetStringUTFChars(mnemonic, JNI_FALSE);
+    const char *_path = env->GetStringUTFChars(path, NULL);
+    const char *_mnemonic = env->GetStringUTFChars(mnemonic, NULL);
 
     Bitmonero::Wallet *wallet =
             Bitmonero::WalletManagerFactory::getWalletManager()->recoveryWallet(
@@ -317,11 +317,11 @@ Java_com_m2049r_xmrwallet_model_WalletManager_createWalletFromKeysJ(JNIEnv *env,
                                                                     jstring addressString,
                                                                     jstring viewKeyString,
                                                                     jstring spendKeyString) {
-    const char *_path = env->GetStringUTFChars(path, JNI_FALSE);
-    const char *_language = env->GetStringUTFChars(language, JNI_FALSE);
-    const char *_addressString = env->GetStringUTFChars(addressString, JNI_FALSE);
-    const char *_viewKeyString = env->GetStringUTFChars(viewKeyString, JNI_FALSE);
-    const char *_spendKeyString = env->GetStringUTFChars(spendKeyString, JNI_FALSE);
+    const char *_path = env->GetStringUTFChars(path, NULL);
+    const char *_language = env->GetStringUTFChars(language, NULL);
+    const char *_addressString = env->GetStringUTFChars(addressString, NULL);
+    const char *_viewKeyString = env->GetStringUTFChars(viewKeyString, NULL);
+    const char *_spendKeyString = env->GetStringUTFChars(spendKeyString, NULL);
 
     Bitmonero::Wallet *wallet =
             Bitmonero::WalletManagerFactory::getWalletManager()->createWalletFromKeys(
@@ -344,7 +344,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_createWalletFromKeysJ(JNIEnv *env,
 JNIEXPORT jboolean JNICALL
 Java_com_m2049r_xmrwallet_model_WalletManager_walletExists(JNIEnv *env, jobject instance,
                                                            jstring path) {
-    const char *_path = env->GetStringUTFChars(path, JNI_FALSE);
+    const char *_path = env->GetStringUTFChars(path, NULL);
     bool exists =
             Bitmonero::WalletManagerFactory::getWalletManager()->walletExists(std::string(_path));
     env->ReleaseStringUTFChars(path, _path);
@@ -356,8 +356,8 @@ Java_com_m2049r_xmrwallet_model_WalletManager_verifyWalletPassword(JNIEnv *env,
                                                                    jstring keys_file_name,
                                                                    jstring password,
                                                                    jboolean watch_only) {
-    const char *_keys_file_name = env->GetStringUTFChars(keys_file_name, JNI_FALSE);
-    const char *_password = env->GetStringUTFChars(password, JNI_FALSE);
+    const char *_keys_file_name = env->GetStringUTFChars(keys_file_name, NULL);
+    const char *_password = env->GetStringUTFChars(password, NULL);
     bool passwordOk =
             Bitmonero::WalletManagerFactory::getWalletManager()->verifyWalletPassword(
                     std::string(_keys_file_name), std::string(_password), watch_only);
@@ -370,7 +370,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_verifyWalletPassword(JNIEnv *env,
 JNIEXPORT jobject JNICALL
 Java_com_m2049r_xmrwallet_model_WalletManager_findWallets(JNIEnv *env, jobject instance,
                                                           jstring path) {
-    const char *_path = env->GetStringUTFChars(path, JNI_FALSE);
+    const char *_path = env->GetStringUTFChars(path, NULL);
     std::vector<std::string> walletPaths =
             Bitmonero::WalletManagerFactory::getWalletManager()->findWallets(std::string(_path));
     env->ReleaseStringUTFChars(path, _path);
@@ -388,7 +388,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_getErrorString(JNIEnv *env, jobjec
 JNIEXPORT void JNICALL
 Java_com_m2049r_xmrwallet_model_WalletManager_setDaemonAddressJ(JNIEnv *env, jobject instance,
                                                                 jstring address) {
-    const char *_address = env->GetStringUTFChars(address, JNI_FALSE);
+    const char *_address = env->GetStringUTFChars(address, NULL);
     Bitmonero::WalletManagerFactory::getWalletManager()->setDaemonAddress(std::string(_address));
     env->ReleaseStringUTFChars(address, _address);
 }
@@ -440,7 +440,7 @@ Java_com_m2049r_xmrwallet_model_WalletManager_startMining(JNIEnv *env, jobject i
                                                           jstring address,
                                                           jboolean background_mining,
                                                           jboolean ignore_battery) {
-    const char *_address = env->GetStringUTFChars(address, JNI_FALSE);
+    const char *_address = env->GetStringUTFChars(address, NULL);
     bool success =
             Bitmonero::WalletManagerFactory::getWalletManager()->startMining(std::string(_address),
                                                                              background_mining,
@@ -458,7 +458,7 @@ JNIEXPORT jstring JNICALL
 Java_com_m2049r_xmrwallet_model_WalletManager_resolveOpenAlias(JNIEnv *env, jobject instance,
                                                                jstring address,
                                                                jboolean dnssec_valid) {
-    const char *_address = env->GetStringUTFChars(address, JNI_FALSE);
+    const char *_address = env->GetStringUTFChars(address, NULL);
     bool _dnssec_valid = (bool) dnssec_valid;
     std::string resolvedAlias =
             Bitmonero::WalletManagerFactory::getWalletManager()->resolveOpenAlias(
@@ -510,7 +510,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_getSeedLanguage(JNIEnv *env, jobject inst
 JNIEXPORT void JNICALL
 Java_com_m2049r_xmrwallet_model_Wallet_setSeedLanguage(JNIEnv *env, jobject instance,
                                                        jstring language) {
-    const char *_language = env->GetStringUTFChars(language, JNI_FALSE);
+    const char *_language = env->GetStringUTFChars(language, NULL);
     Bitmonero::Wallet *wallet = getHandle<Bitmonero::Wallet>(env, instance);
     wallet->setSeedLanguage(std::string(_language));
     env->ReleaseStringUTFChars(language, _language);
@@ -531,7 +531,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_getErrorString(JNIEnv *env, jobject insta
 JNIEXPORT jboolean JNICALL
 Java_com_m2049r_xmrwallet_model_Wallet_setPassword(JNIEnv *env, jobject instance,
                                                    jstring password) {
-    const char *_password = env->GetStringUTFChars(password, JNI_FALSE);
+    const char *_password = env->GetStringUTFChars(password, NULL);
     Bitmonero::Wallet *wallet = getHandle<Bitmonero::Wallet>(env, instance);
     bool success = wallet->setPassword(std::string(_password));
     env->ReleaseStringUTFChars(password, _password);
@@ -562,7 +562,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_isTestNet(JNIEnv *env, jobject instance)
 JNIEXPORT jstring JNICALL
 Java_com_m2049r_xmrwallet_model_Wallet_getIntegratedAddress(JNIEnv *env, jobject instance,
                                                             jstring payment_id) {
-    const char *_payment_id = env->GetStringUTFChars(payment_id, JNI_FALSE);
+    const char *_payment_id = env->GetStringUTFChars(payment_id, NULL);
     Bitmonero::Wallet *wallet = getHandle<Bitmonero::Wallet>(env, instance);
     std::string address = wallet->integratedAddress(_payment_id);
     env->ReleaseStringUTFChars(payment_id, _payment_id);
@@ -584,7 +584,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_getSecretSpendKey(JNIEnv *env, jobject in
 JNIEXPORT jboolean JNICALL
 Java_com_m2049r_xmrwallet_model_Wallet_store(JNIEnv *env, jobject instance,
                                              jstring path) {
-    const char *_path = env->GetStringUTFChars(path, JNI_FALSE);
+    const char *_path = env->GetStringUTFChars(path, NULL);
     Bitmonero::Wallet *wallet = getHandle<Bitmonero::Wallet>(env, instance);
     bool success = wallet->store(std::string(_path));
     if (!success) {
@@ -607,9 +607,9 @@ Java_com_m2049r_xmrwallet_model_Wallet_initJ(JNIEnv *env, jobject instance,
                                              jstring daemon_address,
                                              jlong upper_transaction_size_limit,
                                              jstring daemon_username, jstring daemon_password) {
-    const char *_daemon_address = env->GetStringUTFChars(daemon_address, JNI_FALSE);
-    const char *_daemon_username = env->GetStringUTFChars(daemon_username, JNI_FALSE);
-    const char *_daemon_password = env->GetStringUTFChars(daemon_password, JNI_FALSE);
+    const char *_daemon_address = env->GetStringUTFChars(daemon_address, NULL);
+    const char *_daemon_username = env->GetStringUTFChars(daemon_username, NULL);
+    const char *_daemon_password = env->GetStringUTFChars(daemon_password, NULL);
     Bitmonero::Wallet *wallet = getHandle<Bitmonero::Wallet>(env, instance);
     bool status = wallet->init(_daemon_address, upper_transaction_size_limit, _daemon_username,
                                _daemon_password);
@@ -691,7 +691,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_getDisplayAmount(JNIEnv *env, jobject cla
 JNIEXPORT jlong JNICALL
 Java_com_m2049r_xmrwallet_model_Wallet_getAmountFromString(JNIEnv *env, jobject clazz,
                                                            jstring amount) {
-    const char *_amount = env->GetStringUTFChars(amount, JNI_FALSE);
+    const char *_amount = env->GetStringUTFChars(amount, NULL);
     uint64_t x = Bitmonero::Wallet::amountFromString(_amount);
     env->ReleaseStringUTFChars(amount, _amount);
     return x;
@@ -711,7 +711,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_generatePaymentId(JNIEnv *env, jobject cl
 JNIEXPORT jboolean JNICALL
 Java_com_m2049r_xmrwallet_model_Wallet_isPaymentIdValid(JNIEnv *env, jobject clazz,
                                                         jstring payment_id) {
-    const char *_payment_id = env->GetStringUTFChars(payment_id, JNI_FALSE);
+    const char *_payment_id = env->GetStringUTFChars(payment_id, NULL);
     bool isValid = Bitmonero::Wallet::paymentIdValid(_payment_id);
     env->ReleaseStringUTFChars(payment_id, _payment_id);
     return isValid;
@@ -720,7 +720,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_isPaymentIdValid(JNIEnv *env, jobject cla
 JNIEXPORT jboolean JNICALL
 Java_com_m2049r_xmrwallet_model_Wallet_isAddressValid(JNIEnv *env, jobject clazz,
                                                       jstring address, jboolean isTestNet) {
-    const char *_address = env->GetStringUTFChars(address, JNI_FALSE);
+    const char *_address = env->GetStringUTFChars(address, NULL);
     bool isValid = Bitmonero::Wallet::addressValid(_address, isTestNet);
     env->ReleaseStringUTFChars(address, _address);
     return isValid;
@@ -732,7 +732,7 @@ JNIEXPORT jstring JNICALL
 Java_com_m2049r_xmrwallet_model_Wallet_getPaymentIdFromAddress(JNIEnv *env, jobject clazz,
                                                                jstring address,
                                                                jboolean isTestNet) {
-    const char *_address = env->GetStringUTFChars(address, JNI_FALSE);
+    const char *_address = env->GetStringUTFChars(address, NULL);
     std::string payment_id = Bitmonero::Wallet::paymentIdFromAddress(_address, isTestNet);
     env->ReleaseStringUTFChars(address, _address);
     return env->NewStringUTF(payment_id.c_str());
@@ -776,8 +776,8 @@ Java_com_m2049r_xmrwallet_model_Wallet_createTransactionJ(JNIEnv *env, jobject i
                                                           jlong amount, jint mixin_count,
                                                           jint priority) {
 
-    const char *_dst_addr = env->GetStringUTFChars(dst_addr, JNI_FALSE);
-    const char *_payment_id = env->GetStringUTFChars(payment_id, JNI_FALSE);
+    const char *_dst_addr = env->GetStringUTFChars(dst_addr, NULL);
+    const char *_payment_id = env->GetStringUTFChars(payment_id, NULL);
     Bitmonero::PendingTransaction::Priority _priority =
             static_cast<Bitmonero::PendingTransaction::Priority>(priority);
     Bitmonero::Wallet *wallet = getHandle<Bitmonero::Wallet>(env, instance);
@@ -862,8 +862,8 @@ JNIEXPORT jboolean JNICALL
 Java_com_m2049r_xmrwallet_model_Wallet_setUserNote(JNIEnv *env, jobject instance,
                                                    jstring txid, jstring note) {
 
-    const char *_txid = env->GetStringUTFChars(txid, JNI_FALSE);
-    const char *_note = env->GetStringUTFChars(note, JNI_FALSE);
+    const char *_txid = env->GetStringUTFChars(txid, NULL);
+    const char *_note = env->GetStringUTFChars(note, NULL);
 
     Bitmonero::Wallet *wallet = getHandle<Bitmonero::Wallet>(env, instance);
 
@@ -879,7 +879,7 @@ JNIEXPORT jstring JNICALL
 Java_com_m2049r_xmrwallet_model_Wallet_getUserNote(JNIEnv *env, jobject instance,
                                                    jstring txid) {
 
-    const char *_txid = env->GetStringUTFChars(txid, JNI_FALSE);
+    const char *_txid = env->GetStringUTFChars(txid, NULL);
 
     Bitmonero::Wallet *wallet = getHandle<Bitmonero::Wallet>(env, instance);
 
@@ -893,7 +893,7 @@ JNIEXPORT jstring JNICALL
 Java_com_m2049r_xmrwallet_model_Wallet_getTxKey(JNIEnv *env, jobject instance,
                                                 jstring txid) {
 
-    const char *_txid = env->GetStringUTFChars(txid, JNI_FALSE);
+    const char *_txid = env->GetStringUTFChars(txid, NULL);
 
     Bitmonero::Wallet *wallet = getHandle<Bitmonero::Wallet>(env, instance);
 
@@ -1015,7 +1015,7 @@ JNIEXPORT jboolean JNICALL
 Java_com_m2049r_xmrwallet_model_PendingTransaction_commit(JNIEnv *env, jobject instance,
                                                           jstring filename, jboolean overwrite) {
 
-    const char *_filename = env->GetStringUTFChars(filename, JNI_FALSE);
+    const char *_filename = env->GetStringUTFChars(filename, NULL);
 
     Bitmonero::PendingTransaction *tx = getHandle<Bitmonero::PendingTransaction>(env, instance);
     bool success = tx->commit(_filename, overwrite);
@@ -1060,4 +1060,3 @@ Java_com_m2049r_xmrwallet_model_PendingTransaction_getTxCount(JNIEnv *env, jobje
 #ifdef __cplusplus
 }
 #endif
-

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

@@ -21,27 +21,34 @@ import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
 import android.widget.ProgressBar;
+import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.m2049r.xmrwallet.widget.Toolbar;
 import com.m2049r.xmrwallet.model.Wallet;
 import com.m2049r.xmrwallet.model.WalletManager;
+import com.m2049r.xmrwallet.util.Helper;
 import com.m2049r.xmrwallet.util.MoneroThreadPoolExecutor;
 
+import timber.log.Timber;
+
 public class GenerateReviewFragment extends Fragment {
-    static final String TAG = "GenerateReviewFragment";
     static final public String VIEW_TYPE_DETAILS = "details";
     static final public String VIEW_TYPE_ACCEPT = "accept";
     static final public String VIEW_TYPE_WALLET = "wallet";
 
+    ScrollView scrollview;
+
     ProgressBar pbProgress;
     TextView tvWalletName;
     TextView tvWalletPassword;
@@ -49,14 +56,18 @@ public class GenerateReviewFragment extends Fragment {
     TextView tvWalletMnemonic;
     TextView tvWalletViewKey;
     TextView tvWalletSpendKey;
+    ImageButton bCopyAddress;
+    LinearLayout llAdvancedInfo;
+    Button bAdvancedInfo;
     Button bAccept;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
 
-        View view = inflater.inflate(R.layout.gen_review_fragment, container, false);
+        View view = inflater.inflate(R.layout.fragment_review, container, false);
 
+        scrollview = (ScrollView) view.findViewById(R.id.scrollview);
         pbProgress = (ProgressBar) view.findViewById(R.id.pbProgress);
         tvWalletName = (TextView) view.findViewById(R.id.tvWalletName);
         tvWalletPassword = (TextView) view.findViewById(R.id.tvWalletPassword);
@@ -64,26 +75,15 @@ public class GenerateReviewFragment extends Fragment {
         tvWalletViewKey = (TextView) view.findViewById(R.id.tvWalletViewKey);
         tvWalletSpendKey = (TextView) view.findViewById(R.id.tvWalletSpendKey);
         tvWalletMnemonic = (TextView) view.findViewById(R.id.tvWalletMnemonic);
+        bCopyAddress = (ImageButton) view.findViewById(R.id.bCopyAddress);
+        bAdvancedInfo = (Button) view.findViewById(R.id.bAdvancedInfo);
+        llAdvancedInfo = (LinearLayout) view.findViewById(R.id.llAdvancedInfo);
 
         bAccept = (Button) view.findViewById(R.id.bAccept);
 
         boolean testnet = WalletManager.getInstance().isTestNet();
         tvWalletMnemonic.setTextIsSelectable(testnet);
         tvWalletSpendKey.setTextIsSelectable(testnet);
-        if (!testnet) {
-            tvWalletMnemonic.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    Toast.makeText(getActivity(), getString(R.string.message_noselect_seed), Toast.LENGTH_SHORT).show();
-                }
-            });
-            tvWalletSpendKey.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    Toast.makeText(getActivity(), getString(R.string.message_noselect_key), Toast.LENGTH_SHORT).show();
-                }
-            });
-        }
 
         bAccept.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -91,6 +91,25 @@ public class GenerateReviewFragment extends Fragment {
                 acceptWallet();
             }
         });
+        view.findViewById(R.id.bCopyViewKey).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                copyViewKey();
+            }
+        });
+        bCopyAddress.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                copyAddress();
+            }
+        });
+        bCopyAddress.setClickable(false);
+        view.findViewById(R.id.bAdvancedInfo).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showAdvancedInfo();
+            }
+        });
 
         showProgress();
 
@@ -103,6 +122,31 @@ public class GenerateReviewFragment extends Fragment {
         return view;
     }
 
+    void copyViewKey() {
+        Helper.clipBoardCopy(getActivity(), getString(R.string.label_copy_viewkey), tvWalletViewKey.getText().toString());
+        Toast.makeText(getActivity(), getString(R.string.message_copy_viewkey), Toast.LENGTH_SHORT).show();
+    }
+
+    void copyAddress() {
+        Helper.clipBoardCopy(getActivity(), getString(R.string.label_copy_address), tvWalletAddress.getText().toString());
+        Toast.makeText(getActivity(), getString(R.string.message_copy_address), Toast.LENGTH_SHORT).show();
+    }
+
+    void nocopy() {
+        Toast.makeText(getActivity(), getString(R.string.message_nocopy), Toast.LENGTH_SHORT).show();
+    }
+
+    void showAdvancedInfo() {
+        llAdvancedInfo.setVisibility(View.VISIBLE);
+        bAdvancedInfo.setVisibility(View.GONE);
+        scrollview.post(new Runnable() {
+            @Override
+            public void run() {
+                scrollview.fullScroll(ScrollView.FOCUS_DOWN);
+            }
+        });
+    }
+
     String type;
 
     private void acceptWallet() {
@@ -148,7 +192,7 @@ public class GenerateReviewFragment extends Fragment {
             address = wallet.getAddress();
             seed = wallet.getSeed();
             viewKey = wallet.getSecretViewKey();
-            spendKey = isWatchOnly ? getActivity().getString(R.string.watchonly_label) : wallet.getSecretSpendKey();
+            spendKey = isWatchOnly ? getActivity().getString(R.string.label_watchonly) : wallet.getSecretSpendKey();
             isWatchOnly = wallet.isWatchOnly();
             if (closeWallet) wallet.close();
             return true;
@@ -157,6 +201,7 @@ public class GenerateReviewFragment extends Fragment {
         @Override
         protected void onPostExecute(Boolean result) {
             super.onPostExecute(result);
+            if (!isAdded()) return; // never mind
             tvWalletName.setText(name);
             if (result) {
                 if (type.equals(GenerateReviewFragment.VIEW_TYPE_ACCEPT)) {
@@ -168,9 +213,14 @@ public class GenerateReviewFragment extends Fragment {
                 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));
+                activityCallback.setToolbarButton(
+                        GenerateReviewFragment.VIEW_TYPE_ACCEPT.equals(type) ? Toolbar.BUTTON_NONE : Toolbar.BUTTON_BACK);
             } else {
-                // TODO show proper error message
-                // TODO end the fragment
+                // TODO show proper error message and/or end the fragment?
                 tvWalletAddress.setText(status.toString());
                 tvWalletMnemonic.setText(status.toString());
                 tvWalletViewKey.setText(status.toString());
@@ -180,38 +230,55 @@ public class GenerateReviewFragment extends Fragment {
         }
     }
 
-    GenerateReviewFragment.Listener acceptCallback = null;
-    GenerateReviewFragment.ListenerWithWallet walletCallback = null;
+    Listener activityCallback = null;
+    AcceptListener acceptCallback = null;
+    ListenerWithWallet walletCallback = null;
 
     public interface Listener {
+        void setTitle(String title, String subtitle);
+
+        void setToolbarButton(int type);
+    }
+
+    public interface AcceptListener {
         void onAccept(String name, String password);
     }
 
     public interface ListenerWithWallet {
         Wallet getWallet();
-
     }
 
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        if (context instanceof GenerateReviewFragment.Listener) {
-            this.acceptCallback = (GenerateReviewFragment.Listener) context;
-        } else if (context instanceof GenerateReviewFragment.ListenerWithWallet) {
-            this.walletCallback = (GenerateReviewFragment.ListenerWithWallet) context;
-        } else {
-            throw new ClassCastException(context.toString()
-                    + " must implement Listener");
+        if (context instanceof Listener) {
+            this.activityCallback = (Listener) context;
+        }
+        if (context instanceof AcceptListener) {
+            this.acceptCallback = (AcceptListener) context;
+        }
+        if (context instanceof ListenerWithWallet) {
+            this.walletCallback = (ListenerWithWallet) context;
         }
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        Timber.d("onResume()");
+        String name = tvWalletName.getText().toString();
+        if (name.isEmpty()) name = null;
+        activityCallback.setTitle(name, getString(R.string.details_title));
+        activityCallback.setToolbarButton(
+                GenerateReviewFragment.VIEW_TYPE_ACCEPT.equals(type) ? Toolbar.BUTTON_NONE : Toolbar.BUTTON_BACK);
+    }
+
     public void showProgress() {
-        pbProgress.setIndeterminate(true);
         pbProgress.setVisibility(View.VISIBLE);
     }
 
     public void hideProgress() {
-        pbProgress.setVisibility(View.INVISIBLE);
+        pbProgress.setVisibility(View.GONE);
     }
 
     boolean backOk() {
@@ -227,5 +294,6 @@ public class GenerateReviewFragment extends Fragment {
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.wallet_details_menu, menu);
+        super.onCreateOptionsMenu(menu, inflater);
     }
-}
+}

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

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2017 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet;
+
+public interface OnBackPressedListener {
+    boolean onBackPressed();
+}

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

@@ -20,7 +20,6 @@ import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.app.Fragment;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -28,24 +27,23 @@ import android.widget.Toast;
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.Result;
-import com.m2049r.xmrwallet.util.BarcodeData;
 
 import me.dm7.barcodescanner.zxing.ZXingScannerView;
+import timber.log.Timber;
 
 public class ScannerFragment extends Fragment implements ZXingScannerView.ResultHandler {
-    static final String TAG = "ScannerFragment";
 
-    Listener activityCallback;
+    private OnScannedListener onScannedListener;
 
-    public interface Listener {
-        boolean onAddressScanned(String uri);
+    public interface OnScannedListener {
+        boolean onScanned(String qrCode);
     }
 
     private ZXingScannerView mScannerView;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        Log.d(TAG, "onCreateView");
+        Timber.d("onCreateView");
         mScannerView = new ZXingScannerView(getActivity());
         return mScannerView;
     }
@@ -53,21 +51,15 @@ public class ScannerFragment extends Fragment implements ZXingScannerView.Result
     @Override
     public void onResume() {
         super.onResume();
-        Log.d(TAG, "onResume");
+        Timber.d("onResume");
         mScannerView.setResultHandler(this);
         mScannerView.startCamera();
     }
 
-    static final String QR_SCHEME = "monero:";
-    static final String QR_PAYMENTID = "tx_payment_id";
-    static final String QR_AMOUNT = "tx_amount";
-
     @Override
     public void handleResult(Result rawResult) {
-        //Log.d(TAG, rawResult.getBarcodeFormat().toString() + "/" + rawResult.getText());
-        if ((rawResult.getBarcodeFormat() == BarcodeFormat.QR_CODE) &&
-                (rawResult.getText().startsWith(QR_SCHEME))) {
-            if (activityCallback.onAddressScanned(rawResult.getText())) {
+        if ((rawResult.getBarcodeFormat() == BarcodeFormat.QR_CODE)) {
+            if (onScannedListener.onScanned(rawResult.getText())) {
                 return;
             } else {
                 Toast.makeText(getActivity(), getString(R.string.send_qr_address_invalid), Toast.LENGTH_SHORT).show();
@@ -93,7 +85,7 @@ public class ScannerFragment extends Fragment implements ZXingScannerView.Result
 
     @Override
     public void onPause() {
-        Log.d(TAG, "onPause");
+        Timber.d("onPause");
         mScannerView.stopCamera();
         super.onPause();
     }
@@ -101,12 +93,11 @@ public class ScannerFragment extends Fragment implements ZXingScannerView.Result
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        //Log.d(TAG, "attaching scan");
-        if (context instanceof Listener) {
-            this.activityCallback = (Listener) context;
+        if (context instanceof OnScannedListener) {
+            this.onScannedListener = (OnScannedListener) context;
         } else {
             throw new ClassCastException(context.toString()
                     + " must implement Listener");
         }
     }
-}
+}

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

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2017 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+
+import com.m2049r.xmrwallet.util.Helper;
+
+import java.io.File;
+
+import static android.view.WindowManager.LayoutParams;
+
+public abstract class SecureActivity extends AppCompatActivity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // set FLAG_SECURE to prevent screenshots in Release Mode
+        if (!BuildConfig.DEBUG) {
+            getWindow().setFlags(LayoutParams.FLAG_SECURE, LayoutParams.FLAG_SECURE);
+        }
+    }
+}

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

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2017 m2049r et al.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet;
+
+
+import android.app.Application;
+
+import timber.log.Timber;
+
+public class XmrWalletApplication extends Application {
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        if (BuildConfig.DEBUG) {
+            Timber.plant(new Timber.DebugTree());
+        }
+    }
+}

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

@@ -0,0 +1,200 @@
+/*
+ * Copyright (c) 2017 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet.data;
+
+import android.net.Uri;
+
+import com.m2049r.xmrwallet.model.Wallet;
+import com.m2049r.xmrwallet.model.WalletManager;
+import com.m2049r.xmrwallet.util.BitcoinAddressValidator;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import timber.log.Timber;
+
+public class BarcodeData {
+    public static final String XMR_SCHEME = "monero:";
+    public static final String XMR_PAYMENTID = "tx_payment_id";
+    public static final String XMR_AMOUNT = "tx_amount";
+
+    static final String BTC_SCHEME = "bitcoin:";
+    static final String BTC_AMOUNT = "amount";
+
+    public enum Asset {
+        XMR, BTC
+    }
+
+    public Asset asset = null;
+    public String address = null;
+    public String paymentId = null;
+    public String amount = null;
+
+    public BarcodeData(Asset asset, String address) {
+        this.asset = asset;
+        this.address = address;
+    }
+
+    public BarcodeData(Asset asset, String address, String amount) {
+        this.asset = asset;
+        this.address = address;
+        this.amount = amount;
+    }
+
+    public BarcodeData(Asset asset, String address, String paymentId, String amount) {
+        this.asset = asset;
+        this.address = address;
+        this.paymentId = paymentId;
+        this.amount = amount;
+    }
+
+    static public BarcodeData fromQrCode(String qrCode) {
+        // check for monero uri
+        BarcodeData bcData = parseMoneroUri(qrCode);
+        // check for naked monero address / integrated address
+        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;
+    }
+
+    /**
+     * Parse and decode a monero scheme string. It is here because it needs to validate the data.
+     *
+     * @param uri String containing a monero URL
+     * @return BarcodeData object or null if uri not valid
+     */
+
+    static public BarcodeData parseMoneroUri(String uri) {
+        Timber.d("parseMoneroUri=%s", uri);
+
+        if (uri == null) return null;
+
+        if (!uri.startsWith(XMR_SCHEME)) return null;
+
+        String noScheme = uri.substring(XMR_SCHEME.length());
+        Uri monero = Uri.parse(noScheme);
+        Map<String, String> parms = new HashMap<>();
+        String query = monero.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 = monero.getPath();
+        String paymentId = parms.get(XMR_PAYMENTID);
+        String amount = parms.get(XMR_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 ((paymentId != null) && !Wallet.isPaymentIdValid(paymentId)) {
+            Timber.d("paymentId invalid");
+            return null;
+        }
+
+        if (!Wallet.isAddressValid(address)) {
+            Timber.d("address invalid");
+            return null;
+        }
+        return new BarcodeData(Asset.XMR, address, paymentId, amount);
+    }
+
+    static public BarcodeData parseMoneroNaked(String address) {
+        Timber.d("parseMoneroNaked=%s", address);
+
+        if (address == null) return null;
+
+        if (!Wallet.isAddressValid(address)) {
+            Timber.d("address invalid");
+            return null;
+        }
+
+        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, WalletManager.getInstance().isTestNet())) {
+            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, WalletManager.getInstance().isTestNet())) {
+            Timber.d("address invalid");
+            return null;
+        }
+
+        return new BarcodeData(BarcodeData.Asset.BTC, address);
+    }
+}

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

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2017 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet.data;
+
+import com.m2049r.xmrwallet.model.PendingTransaction;
+
+public class PendingTx {
+    final public PendingTransaction.Status status;
+    final public String error;
+    final public long amount;
+    final public long dust;
+    final public long fee;
+    final public String txId;
+    final public long txCount;
+
+    public PendingTx(PendingTransaction pendingTransaction) {
+        status = pendingTransaction.getStatus();
+        error = pendingTransaction.getErrorString();
+        amount = pendingTransaction.getAmount();
+        dust = pendingTransaction.getDust();
+        fee = pendingTransaction.getFee();
+        txId = pendingTransaction.getFirstTxId();
+        txCount = pendingTransaction.getTxCount();
+    }
+}

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

@@ -14,36 +14,101 @@
  * limitations under the License.
  */
 
-package com.m2049r.xmrwallet.util;
+package com.m2049r.xmrwallet.data;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 
 import com.m2049r.xmrwallet.model.PendingTransaction;
+import com.m2049r.xmrwallet.util.UserNotes;
+
+import timber.log.Timber;
 
 // https://stackoverflow.com/questions/2139134/how-to-send-an-object-from-one-android-activity-to-another-using-intents
 public class TxData implements Parcelable {
-    public TxData(String dst_addr,
+
+    public TxData() {
+    }
+
+    public TxData(TxData txData) {
+        this.dstAddr = txData.dstAddr;
+        this.paymentId = txData.paymentId;
+        this.amount = txData.amount;
+        this.mixin = txData.mixin;
+        this.priority = txData.priority;
+    }
+
+    public TxData(String dstAddr,
                   String paymentId,
                   long amount,
                   int mixin,
                   PendingTransaction.Priority priority) {
-        this.dst_addr = dst_addr;
+        this.dstAddr = dstAddr;
         this.paymentId = paymentId;
         this.amount = amount;
         this.mixin = mixin;
         this.priority = priority;
     }
 
-    public String dst_addr;
-    public String paymentId;
-    public long amount;
-    public int mixin;
-    public PendingTransaction.Priority priority;
+    public String getDestinationAddress() {
+        return dstAddr;
+    }
+
+    public String getPaymentId() {
+        return paymentId;
+    }
+
+    public long getAmount() {
+        return amount;
+    }
+
+    public int getMixin() {
+        return mixin;
+    }
+
+    public PendingTransaction.Priority getPriority() {
+        return priority;
+    }
+
+    public void setDestinationAddress(String dstAddr) {
+        this.dstAddr = dstAddr;
+    }
+
+    public void setPaymentId(String paymentId) {
+        this.paymentId = paymentId;
+    }
+
+    public void setAmount(long amount) {
+        this.amount = amount;
+    }
+
+    public void setMixin(int mixin) {
+        this.mixin = mixin;
+    }
+
+    public void setPriority(PendingTransaction.Priority priority) {
+        this.priority = priority;
+    }
+
+    public UserNotes getUserNotes() {
+        return userNotes;
+    }
+
+    public void setUserNotes(UserNotes userNotes) {
+        this.userNotes = userNotes;
+    }
+
+    private String dstAddr;
+    private String paymentId;
+    private long amount;
+    private int mixin;
+    private PendingTransaction.Priority priority;
+
+    private UserNotes userNotes;
 
     @Override
     public void writeToParcel(Parcel out, int flags) {
-        out.writeString(dst_addr);
+        out.writeString(dstAddr);
         out.writeString(paymentId);
         out.writeLong(amount);
         out.writeInt(mixin);
@@ -61,8 +126,8 @@ public class TxData implements Parcelable {
         }
     };
 
-    private TxData(Parcel in) {
-        dst_addr = in.readString();
+    protected TxData(Parcel in) {
+        dstAddr = in.readString();
         paymentId = in.readString();
         amount = in.readLong();
         mixin = in.readInt();
@@ -78,8 +143,8 @@ public class TxData implements Parcelable {
     @Override
     public String toString() {
         StringBuffer sb = new StringBuffer();
-        sb.append("dst_addr:");
-        sb.append(dst_addr);
+        sb.append("dstAddr:");
+        sb.append(dstAddr);
         sb.append(",paymentId:");
         sb.append(paymentId);
         sb.append(",amount:");
@@ -87,7 +152,7 @@ public class TxData implements Parcelable {
         sb.append(",mixin:");
         sb.append(mixin);
         sb.append(",priority:");
-        sb.append(priority.toString());
+        sb.append(String.valueOf(priority));
         return sb.toString();
     }
 }

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

@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2017 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet.data;
+
+import android.os.Parcel;
+
+import com.m2049r.xmrwallet.model.PendingTransaction;
+
+public class TxDataBtc extends TxData {
+
+    private String xmrtoUuid;
+    private String btcAddress;
+    private double btcAmount;
+
+    public TxDataBtc() {
+        super();
+    }
+
+    public TxDataBtc(TxDataBtc txDataBtc) {
+        super(txDataBtc);
+    }
+
+    public String getXmrtoUuid() {
+        return xmrtoUuid;
+    }
+
+    public void setXmrtoUuid(String xmrtoUuid) {
+        this.xmrtoUuid = xmrtoUuid;
+    }
+
+    public String getBtcAddress() {
+        return btcAddress;
+    }
+
+    public void setBtcAddress(String btcAddress) {
+        this.btcAddress = btcAddress;
+    }
+
+    public double getBtcAmount() {
+        return btcAmount;
+    }
+
+    public void setBtcAmount(double btcAmount) {
+        this.btcAmount = btcAmount;
+    }
+
+    @Override
+    public void writeToParcel(Parcel out, int flags) {
+        super.writeToParcel(out, flags);
+        out.writeString(xmrtoUuid);
+        out.writeString(btcAddress);
+        out.writeDouble(btcAmount);
+    }
+
+    // this is used to regenerate your object. All Parcelables must have a CREATOR that implements these two methods
+    public static final Creator<TxDataBtc> CREATOR = new Creator<TxDataBtc>() {
+        public TxDataBtc createFromParcel(Parcel in) {
+            return new TxDataBtc(in);
+        }
+
+        public TxDataBtc[] newArray(int size) {
+            return new TxDataBtc[size];
+        }
+    };
+
+    protected TxDataBtc(Parcel in) {
+        super(in);
+        xmrtoUuid = in.readString();
+        btcAddress = in.readString();
+        btcAmount = in.readDouble();
+    }
+
+    @Override
+    public String toString() {
+        StringBuffer sb = new StringBuffer();
+        sb.append(",xmrtoUuid:");
+        sb.append(xmrtoUuid);
+        sb.append(",btcAddress:");
+        sb.append(btcAddress);
+        sb.append(",btcAmount:");
+        sb.append(btcAmount);
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2017 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet.dialog;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
+import android.text.Html;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+
+import com.m2049r.xmrwallet.BuildConfig;
+import com.m2049r.xmrwallet.R;
+
+public class AboutFragment extends DialogFragment {
+    static final String TAG = "AboutFragment";
+
+    public static AboutFragment newInstance() {
+        return new AboutFragment();
+    }
+
+    public static void display(FragmentManager fm) {
+        FragmentTransaction ft = fm.beginTransaction();
+        Fragment prev = fm.findFragmentByTag(TAG);
+        if (prev != null) {
+            ft.remove(prev);
+        }
+
+        AboutFragment.newInstance().show(ft, TAG);
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        final View view = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_about, null);
+        ((TextView) view.findViewById(R.id.tvHelp)).setText(Html.fromHtml(getString(R.string.about_licenses)));
+        ((TextView) view.findViewById(R.id.tvVersion)).setText(getString(R.string.about_version, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE));
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        builder.setView(view);
+        builder.setNegativeButton(R.string.about_close,
+                new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int id) {
+                        dialog.dismiss();
+                    }
+                });
+        return builder.create();
+    }
+}

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

@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2017 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet.dialog;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
+import android.text.Html;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.m2049r.xmrwallet.R;
+import com.m2049r.xmrwallet.util.Helper;
+
+public class DonationFragment extends DialogFragment {
+    static final String TAG = "DonationFragment";
+
+    public static DonationFragment newInstance() {
+        return new DonationFragment();
+    }
+
+    public static void display(FragmentManager fm) {
+        FragmentTransaction ft = fm.beginTransaction();
+        Fragment prev = fm.findFragmentByTag(TAG);
+        if (prev != null) {
+            ft.remove(prev);
+        }
+
+        DonationFragment.newInstance().show(ft, TAG);
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        final View view = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_donation, null);
+
+        ((TextView) view.findViewById(R.id.tvCredits)).setText(Html.fromHtml(getString(R.string.donation_credits)));
+
+        (view.findViewById(R.id.bCopyAddress)).
+                setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        Helper.clipBoardCopy(getActivity(), getString(R.string.label_copy_address),
+                                ((TextView) view.findViewById(R.id.tvWalletAddress)).getText().toString());
+                        Toast.makeText(getActivity(), getString(R.string.message_copy_address), Toast.LENGTH_SHORT).show();
+                    }
+                });
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        builder.setView(view);
+        builder.setNegativeButton(R.string.about_close,
+                new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int id) {
+                        dialog.dismiss();
+                    }
+                });
+
+        return builder.create();
+    }
+}

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

@@ -1,12 +1,12 @@
-/**
- * Copyright 2013 Adam Speakman, m2049r
- * <p>
+/*
+ * Copyright (c) 2017 m2049r
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * <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.
@@ -16,97 +16,57 @@
 
 package com.m2049r.xmrwallet.dialog;
 
-import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
+import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.webkit.WebView;
-import android.widget.ProgressBar;
+import android.widget.TextView;
 
 import com.m2049r.xmrwallet.R;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-/**
- * Based on LicensesFragment by Adam Speakman on 24/09/13.
- * http://speakman.net.nz
- */
 public class HelpFragment extends DialogFragment {
-    private static final String FRAGMENT_TAG = "com.m2049r.xmrwallet.dialog.HelpFragment";
+    static final String TAG = "HelpFragment";
     private static final String HELP_ID = "HELP_ID";
 
-    private AsyncTask<Void, Void, String> loader;
-
     public static HelpFragment newInstance(int helpResourceId) {
         HelpFragment fragment = new HelpFragment();
-
         Bundle bundle = new Bundle();
         bundle.putInt(HELP_ID, helpResourceId);
         fragment.setArguments(bundle);
-
         return fragment;
     }
 
-    /**
-     * @param fm A fragment manager instance used to display this LicensesFragment.
-     */
-    public static void displayHelp(FragmentManager fm, int helpResourceId) {
+    public static void display(FragmentManager fm, int helpResourceId) {
         FragmentTransaction ft = fm.beginTransaction();
-        Fragment prev = fm.findFragmentByTag(FRAGMENT_TAG);
+        Fragment prev = fm.findFragmentByTag(TAG);
         if (prev != null) {
             ft.remove(prev);
         }
-        ft.addToBackStack(null);
 
-        // Create and show the dialog.
-        DialogFragment newFragment = HelpFragment.newInstance(helpResourceId);
-        newFragment.show(ft, FRAGMENT_TAG);
+        HelpFragment.newInstance(helpResourceId).show(ft, TAG);
     }
 
     @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        final View view = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_help, null);
+
         int helpId = 0;
         Bundle arguments = getArguments();
         if (arguments != null) {
             helpId = arguments.getInt(HELP_ID);
         }
         if (helpId > 0)
-            loadHelp(helpId);
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        if (loader != null) {
-            loader.cancel(true);
-        }
-    }
-
-    private WebView webView;
-    private ProgressBar progress;
-
-    @SuppressLint("InflateParams")
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        View content = LayoutInflater.from(getActivity()).inflate(R.layout.help_fragment, null);
-        webView = (WebView) content.findViewById(R.id.helpFragmentWebView);
-        progress = (ProgressBar) content.findViewById(R.id.helpFragmentProgress);
+            ((TextView) view.findViewById(R.id.tvHelp)).setText(Html.fromHtml(getString(helpId)));
 
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-
-        builder.setView(content);
+        builder.setView(view);
         builder.setNegativeButton(R.string.about_close,
                 new DialogInterface.OnClickListener() {
                     @Override
@@ -114,47 +74,6 @@ public class HelpFragment extends DialogFragment {
                         dialog.dismiss();
                     }
                 });
-
         return builder.create();
     }
-
-    private void loadHelp(final int helpResourceId) {
-        // Load asynchronously in case of a very large file.
-        loader = new AsyncTask<Void, Void, String>() {
-
-            @Override
-            protected String doInBackground(Void... params) {
-                InputStream rawResource = getActivity().getResources().openRawResource(helpResourceId);
-                BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(rawResource));
-
-                String line;
-                StringBuilder sb = new StringBuilder();
-
-                try {
-                    while ((line = bufferedReader.readLine()) != null) {
-                        sb.append(line);
-                        sb.append("\n");
-                    }
-                    bufferedReader.close();
-                } catch (IOException e) {
-                    // TODO You may want to include some logging here.
-                }
-
-                return sb.toString();
-            }
-
-            @Override
-            protected void onPostExecute(String licensesBody) {
-                super.onPostExecute(licensesBody);
-                if (getActivity() == null || isCancelled()) {
-                    return;
-                }
-                progress.setVisibility(View.INVISIBLE);
-                webView.setVisibility(View.VISIBLE);
-                webView.loadDataWithBaseURL(null, licensesBody, "text/html", "utf-8", null);
-                loader = null;
-            }
-
-        }.execute();
-    }
 }

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

@@ -1,164 +0,0 @@
-/**
- * Copyright 2013 Adam Speakman, 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.
- */
-
-package com.m2049r.xmrwallet.dialog;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-import android.annotation.SuppressLint;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.os.AsyncTask;
-import android.os.Bundle;
-//TODO If you don't support Android 2.x, you should use the non-support version!
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.webkit.WebView;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import com.m2049r.xmrwallet.BuildConfig;
-import com.m2049r.xmrwallet.R;
-
-/**
- * Created by Adam Speakman on 24/09/13.
- * http://speakman.net.nz
- */
-public class LicensesFragment extends DialogFragment {
-    int versionCode = BuildConfig.VERSION_CODE;
-    String versionName = BuildConfig.VERSION_NAME;
-
-    private AsyncTask<Void, Void, String> mLicenseLoader;
-
-    private static final String FRAGMENT_TAG = "com.m2049r.xmrwalelt.dialog.LicensesFragment";
-
-    /**
-     * Creates a new instance of LicensesFragment with no Close button.
-     *
-     * @return A new licenses fragment.
-     */
-    public static LicensesFragment newInstance() {
-        return new LicensesFragment();
-    }
-
-    /**
-     * Builds and displays a licenses fragment with no Close button. Requires
-     * "/res/raw/licenses.html" and "/res/layout/licenses_fragment.xml" to be
-     * present.
-     *
-     * @param fm A fragment manager instance used to display this LicensesFragment.
-     */
-    public static void displayLicensesFragment(FragmentManager fm) {
-        FragmentTransaction ft = fm.beginTransaction();
-        Fragment prev = fm.findFragmentByTag(FRAGMENT_TAG);
-        if (prev != null) {
-            ft.remove(prev);
-        }
-        ft.addToBackStack(null);
-
-        // Create and show the dialog.
-        DialogFragment newFragment = LicensesFragment.newInstance();
-        newFragment.show(ft, FRAGMENT_TAG);
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        loadLicenses();
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        if (mLicenseLoader != null) {
-            mLicenseLoader.cancel(true);
-        }
-    }
-
-    private WebView mWebView;
-    private ProgressBar mIndeterminateProgress;
-
-    @SuppressLint("InflateParams")
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        View content = LayoutInflater.from(getActivity()).inflate(R.layout.licenses_fragment, null);
-        mWebView = (WebView) content.findViewById(R.id.licensesFragmentWebView);
-        mIndeterminateProgress = (ProgressBar) content.findViewById(R.id.licensesFragmentIndeterminateProgress);
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        TextView text = (TextView) content.findViewById(R.id.licensesFragmentText);
-        text.setText(getString(R.string.about_text, versionName, versionCode));
-
-        builder.setView(content);
-        builder.setNegativeButton(R.string.about_close,
-                new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int id) {
-                        dialog.dismiss();
-                    }
-                });
-
-        return builder.create();
-    }
-
-    private void loadLicenses() {
-        // Load asynchronously in case of a very large file.
-        mLicenseLoader = new AsyncTask<Void, Void, String>() {
-
-            @Override
-            protected String doInBackground(Void... params) {
-                InputStream rawResource = getActivity().getResources().openRawResource(R.raw.licenses);
-                BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(rawResource));
-
-                String line;
-                StringBuilder sb = new StringBuilder();
-
-                try {
-                    while ((line = bufferedReader.readLine()) != null) {
-                        sb.append(line);
-                        sb.append("\n");
-                    }
-                    bufferedReader.close();
-                } catch (IOException e) {
-                    // TODO You may want to include some logging here.
-                }
-
-                return sb.toString();
-            }
-
-            @Override
-            protected void onPostExecute(String licensesBody) {
-                super.onPostExecute(licensesBody);
-                if (getActivity() == null || isCancelled()) {
-                    return;
-                }
-                mIndeterminateProgress.setVisibility(View.INVISIBLE);
-                mWebView.setVisibility(View.VISIBLE);
-                mWebView.loadDataWithBaseURL(null, licensesBody, "text/html", "utf-8", null);
-                mLicenseLoader = null;
-            }
-
-        }.execute();
-    }
-}