Update FAQ.md

* clear error

* isAddressValid refactoring

* better numpad layout

* receive qr code as card

* scan integrated address

.gitignore

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

.idea/.gitignore

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

.idea/libraries/animated_vector_drawable_25_3_1.xml

@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="animated-vector-drawable-25.3.1">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/c5daa70b6947fa9fd8a9960e661cc14fc4797397/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/c5daa70b6947fa9fd8a9960e661cc14fc4797397/output/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/Sdk/extras/android/m2repository/com/android/support/animated-vector-drawable/25.3.1/animated-vector-drawable-25.3.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/appcompat_v7_25_3_1.xml

@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="appcompat-v7-25.3.1">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.android/build-cache/7347280c7c5efbce562b3f7493acce3ce62120aa/output/res" />
-      <root url="jar://$USER_HOME$/.android/build-cache/7347280c7c5efbce562b3f7493acce3ce62120aa/output/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/Sdk/extras/android/m2repository/com/android/support/appcompat-v7/25.3.1/appcompat-v7-25.3.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/cardview_v7_25_3_1.xml

@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="cardview-v7-25.3.1">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.android/build-cache/d3101339ab3be4a16068a03e764036d173229f64/output/res" />
-      <root url="jar://$USER_HOME$/.android/build-cache/d3101339ab3be4a16068a03e764036d173229f64/output/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/Sdk/extras/android/m2repository/com/android/support/cardview-v7/25.3.1/cardview-v7-25.3.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.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/design_25_3_1.xml

@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="design-25.3.1">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.android/build-cache/222602355d1fc232e06a3e23c06dc49c03836f7a/output/res" />
-      <root url="jar://$USER_HOME$/.android/build-cache/222602355d1fc232e06a3e23c06dc49c03836f7a/output/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/Sdk/extras/android/m2repository/com/android/support/design/25.3.1/design-25.3.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/recyclerview_v7_25_3_1.xml

@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="recyclerview-v7-25.3.1">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/99e5fdc3d331d7083d1b3759b72d024c2f736dcd/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/99e5fdc3d331d7083d1b3759b72d024c2f736dcd/output/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/Sdk/extras/android/m2repository/com/android/support/recyclerview-v7/25.3.1/recyclerview-v7-25.3.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/support_annotations_25_3_1.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="support-annotations-25.3.1">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/Sdk/extras/android/m2repository/com/android/support/support-annotations/25.3.1/support-annotations-25.3.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/Sdk/extras/android/m2repository/com/android/support/support-annotations/25.3.1/support-annotations-25.3.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/support_compat_25_3_1.xml

@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="support-compat-25.3.1">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.android/build-cache/bfee7899a02ec429f8d6fbb22abb30af9d75dd54/output/res" />
-      <root url="jar://$USER_HOME$/.android/build-cache/bfee7899a02ec429f8d6fbb22abb30af9d75dd54/output/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/Sdk/extras/android/m2repository/com/android/support/support-compat/25.3.1/support-compat-25.3.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/support_core_ui_25_3_1.xml

@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="support-core-ui-25.3.1">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.android/build-cache/f1e0938f7953f4d9d6e09e6205aea1c4ea1bf919/output/res" />
-      <root url="jar://$USER_HOME$/.android/build-cache/f1e0938f7953f4d9d6e09e6205aea1c4ea1bf919/output/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/Sdk/extras/android/m2repository/com/android/support/support-core-ui/25.3.1/support-core-ui-25.3.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/support_core_utils_25_3_1.xml

@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="support-core-utils-25.3.1">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.android/build-cache/3399641f4104cc67bc990816452765709c509ff9/output/res" />
-      <root url="jar://$USER_HOME$/.android/build-cache/3399641f4104cc67bc990816452765709c509ff9/output/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/Sdk/extras/android/m2repository/com/android/support/support-core-utils/25.3.1/support-core-utils-25.3.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/support_fragment_25_3_1.xml

@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="support-fragment-25.3.1">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/3f5c9811e6cfbd571b84d0dbb634b48dfe989015/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/3f5c9811e6cfbd571b84d0dbb634b48dfe989015/output/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/Sdk/extras/android/m2repository/com/android/support/support-fragment/25.3.1/support-fragment-25.3.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/support_media_compat_25_3_1.xml

@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="support-media-compat-25.3.1">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.android/build-cache/7ed270352f6e04a617f3ff349bf4590f91afd032/output/res" />
-      <root url="jar://$USER_HOME$/.android/build-cache/7ed270352f6e04a617f3ff349bf4590f91afd032/output/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/Sdk/extras/android/m2repository/com/android/support/support-media-compat/25.3.1/support-media-compat-25.3.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/support_v4_25_3_1.xml

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

.idea/libraries/support_vector_drawable_25_3_1.xml

@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="support-vector-drawable-25.3.1">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/e6ca1fb96a4aeca737119703e3fea72846da3ca1/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/e6ca1fb96a4aeca737119703e3fea72846da3ca1/output/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/Sdk/extras/android/m2repository/com/android/support/support-vector-drawable/25.3.1/support-vector-drawable-25.3.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/transition_25_3_1.xml

@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="transition-25.3.1">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/1ff9f43f47f4f75d31b57959475cee7001de24ac/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/1ff9f43f47f4f75d31b57959475cee7001de24ac/output/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/Sdk/extras/android/m2repository/com/android/support/transition/25.3.1/transition-25.3.1-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>

.idea/misc.xml

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-        </list>
-      </value>
-    </option>
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>

README.md

@@ -14,18 +14,20 @@ You may lose all your Moneroj if you use this App. Be cautious when spending on
 - Based off monero v0.11.0.0 with PR #2289 applied
 - currently only android32 (runs on 64-bit as well)
 - works on the testnet & mainnet
-- takes forever to sync due to 32-bit architecture
+- 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
-- check licenses of included libraries; License Dialog
 
 ### 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.
+- 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.
@@ -34,7 +36,7 @@ The official monero client shows the same behaviour.
 No need to build. Binaries are included:
 
 - openssl-1.0.2l
-- monero-v0.10.3.1 + pull requests #2238, #2239 and #2289
+- monero-v0.11.0.0 + pull requests #2289
 - 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 12
-        versionName "0.7"
+        versionCode 51
+        versionName "1.2.11"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
@@ -36,36 +36,46 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:design:25.3.1'
+    compile 'com.android.support:appcompat-v7:25.4.0'
+    compile 'com.android.support:design:25.4.0'
+    compile 'com.android.support:support-v4:25.4.0'
+    compile 'com.android.support:recyclerview-v7:25.4.0'
+    compile 'com.android.support:cardview-v7:25.4.0'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile 'com.android.support:support-v4:25.3.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
-    compile 'com.android.support:cardview-v7:25.3.1'
     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:design:a3e83064fe99d0a4369f9b46d8bfbe77d0c3022fffdee4be3ac3857b87cc89e3',
-            'com.android.support:appcompat-v7:ac1ebbc46589195dda3e0b1becfe410bafd75bdf3edd1cd9acf04850f3895830',
-            'com.android.support.constraint:constraint-layout:b0c688cc2b7172608f8153a689d746da40f71e52d7e2fe2bfd9df2f92db77085',
-            'com.android.support:transition:36c688825a8c0e6e879e18886de83dc90673322822d5b606ee302f70fb558e16',
+            '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:07d389154bcf73b47e514964df1578136b26cba78257b8a577a3ccb54beff0ae',
-            'com.android.support:recyclerview-v7:375974a8724e359d97d77fa8522c614f813a3ac4583c1807f154a3f9a054b0a1',
-            'com.android.support:cardview-v7:defc17032ffa600a82e1c7d96bb574aa5ed64e2b57e28414a245da7d6db0c666',
-            'com.android.support:animated-vector-drawable:4bc46edf1946b32d518b41416d1734e915e0cbb28021de3b340527419b070691',
-            'com.android.support:support-vector-drawable:13728f337f36d1c02d52198a6c20724edb447a0875454d829f95cb9eb4aa293b',
-            'com.android.support:support-fragment:541d6393c1e024453aca2a14f31bea0c7270ff4e2a02783f3528aa426367444d',
-            'com.android.support:support-media-compat:cbed07d07e0e84fdb4b75712f5fd946229a8af155933c9a92e41db64d00791e0',
-            'com.android.support:support-core-utils:32fac02eb2c20a77fa3e3bc3ede62392a19613f72b8f8e10f5dfa84bb4c89ea1',
-            'com.android.support:support-core-ui:6182278a6653e6c111c888963626cbb16f2d0022571cb239760475119e0b92a8',
-            'com.android.support:support-compat:e02d781268dc60aab6638d8dc20156ea11ca20b962d294b85e6f1e8418cabfa7',
-            'com.android.support:support-annotations:aedf76962584adfaed2bd3fcaa22406461c4310237fc27e301128edaa2dba2fa',
+            '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',
+            'com.android.support:animated-vector-drawable:628ab1d56a6ee4cbedf32617af8b2a1fe02964ed0628e8f898cc09ddba6e1835',
+            '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-compat:54019c63614ce08b02d7b9605490cd2b29ba5b2505f394a9517450b5f72b30ca',
+            'com.android.support:support-annotations:a774272036941b4e912eb426d70c848bde7f06a3bf5fb491f75a427dc6595270',
             'com.android.support.constraint:constraint-layout-solver:8c62525a9bc5cff5633a96cb9b32fffeccaf41b8841aa87fc22607070dea9b8d',
             'com.google.zxing:core:bba7724e02a997cec38213af77133ee8e24b0d5cf5fa7ecbc16a4fa93f11ee0d',
+            'com.squareup.okio:okio:734269c3ebc5090e3b23566db558f421f0b4027277c79ad5d176b8ec168bb850',
+            'com.squareup.okhttp3:okhttp:7265adbd6f028aade307f58569d814835cd02bc9beffb70c25f72c9de50d61c4',
     ]
 }
-

app/src/main/AndroidManifest.xml

@@ -3,7 +3,6 @@
     package="com.m2049r.xmrwallet">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -11,9 +10,10 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/ic_monero_32dp"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
+        android:name=".XmrWalletApplication"
         android:theme="@style/MyMaterialTheme">
 
         <activity

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

@@ -19,25 +19,36 @@ package com.m2049r.xmrwallet;
 import android.content.Context;
 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;
@@ -45,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);
@@ -60,6 +75,9 @@ 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);
 
@@ -73,6 +91,24 @@ 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();
+            }
+        });
+        view.findViewById(R.id.bAdvancedInfo).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showAdvancedInfo();
+            }
+        });
 
         showProgress();
 
@@ -85,6 +121,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() {
@@ -130,7 +191,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;
@@ -139,6 +200,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)) {
@@ -150,9 +212,14 @@ public class GenerateReviewFragment extends Fragment {
                 tvWalletMnemonic.setText(seed);
                 tvWalletViewKey.setText(viewKey);
                 tvWalletSpendKey.setText(spendKey);
+                bAdvancedInfo.setVisibility(View.VISIBLE);
+                bCopyAddress.setEnabled(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());
@@ -162,41 +229,70 @@ 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() {
         return !type.equals(GenerateReviewFragment.VIEW_TYPE_ACCEPT);
     }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
+    @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();
+}