Merge pull request #14 from fuwa0529/dev-v0.5

Prep for 0.5

README.md

@@ -6,27 +6,22 @@ An Android Wallet for Wownero
       height="80">](https://f-droid.org/packages/com.wownero.wownerujo/)
 <a href='https://play.google.com/store/apps/details?id=com.wownero.wownerujo&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height='80'/></a>
 
-## Preparing for upcoming Wownero v0.5
-
-Some of the included remote nodes have been upgraded to Wownero v0.5, which are incompatible to the current released version of Wownerujo. Consider upgrading to the [beta channel], if you have your seed backed up and are using the Google Play store. Or you might consider running your own node, since you will need one eventually.
-
 ## QUICKSTART
-- Download the APK for the most current release [here](https://f-droid.org/packages/com.wownero.wownerujo/) and install it
-- Run the App and select "Generate Wallet" to create a new wallet or recover a wallet
-- Advanced users can copy over synced wallet files (all files) onto sdcard in directory Wownerujo (created first time App is started)
-- See the [FAQ](doc/FAQ.md)
+- Download it with the F-Droid app or the Google Play app.
+- Run it and click `⊕` to create a new wallet or recover a wallet.
+- See the [FAQ](doc/FAQ.md).
 
 ## Disclaimer
-You may lose all your Wowneroj if you use this App. Be cautious when spending on the mainnet.
+You may lose all your Wowneroj if you use this app.
 
 ## Random Notes
-- Based off wownero v0.4.0.0
-- use your own daemon - it's easy
-- screen stays on until first sync is complete
+- Based off Wownero v0.5.
+- Use your own daemon.
+- Screen stays on until first sync is complete.
 
 ## HOW TO BUILD
 
-If you want to build the external libs yourself (recommended) check out [the instructions](doc/BUILDING-external-libs.md)
+If you want to build the external libs yourself (recommended) check out [the instructions](doc/BUILDING-external-libs.md).
 
 Then, fire up Android Studio and build the APK.
 

app/build.gradle

@@ -10,8 +10,8 @@ android {
         // https://source.android.com/security/bulletin/2018-03-01
         minSdkVersion 23
         targetSdkVersion 28
-        versionCode 1140
-        versionName '2.5.0.0'
+        versionCode 1170
+        versionName '2.5.0.3'
         // testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {

app/src/main/java/com/wownero/wownerujo/util/RestoreHeight.java

@@ -51,9 +51,11 @@ static public RestoreHeight getInstance() {
         blockheight.put("2018-10", 52000L);
         blockheight.put("2018-11", 60000L);
         blockheight.put("2018-12", 66000L);
+        blockheight.put("2019-01", 72000L);
+        blockheight.put("2019-02", 77000L);
     }
 
-    long latestHeight = 66000L;
+    long latestHeight = 77000L;
 
     public long getHeight(final Date date) {
         Timber.d("Restore Height date %s", date);
@@ -85,3 +87,4 @@ public long getHeight(final Date date) {
         return height;
     }
 }
+

app/src/main/res/values/about.xml

@@ -50,21 +50,21 @@
         <h2>Changes to this Privacy Policy</h2>
         <p>We may update this privacy policy from time to time. We will notify
         you of any changes by posting the new privacy policy in the app and on the
-        website (https://github.com/fuwa0529/wownerujo).
+        website (https://github.com/wownero/wownerujo).
         You are advised to review this privacy policy periodically for any changes.
         <p>This Privacy Policy was last updated: 13th Oct, 2018.
         </p>
         <h2>Contact Us</h2>
         <p>If you have any questions about our privacy policy,
         or how your data is being collected and processed,
-        please visit https://github.com/fuwa0529/wownerujo
+        please visit https://github.com/wownero/wownerujo
         </p>
         ]]></string>
 
     <string name="about_licenses" translatable="false"><![CDATA[
         <h1>Open Source Licenses</h1>
         <h2>Licensed under the Apache License, Version 2.0</h2>
-        <h3>Wownerujo (https://github.com/fuwa0529/wownerujo)</h3>
+        <h3>Wownerujo (https://github.com/wownero/wownerujo)</h3>
 
         Copyright (c) 2018 wownero.org
         <br/><br/>

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

@@ -373,7 +373,7 @@
     <string name="send_sweepall">Send all confirmed funds in this account!</string>
     <string name="tx_subaddress">Subaddress #%1$d</string>
     <string name="generate_address_label_sub">Public Subaddress #%1$d</string>
-    <string name="default_restore_height">2018-12</string>
+    <string name="default_restore_height">2019-02</string>
     <string name="menu_language">Language</string>
     <string name="language_system_default">Use System Language</string>
 </resources>

script/build-external-libs/fetch-wownero.sh

@@ -10,11 +10,10 @@ cd $EXTERNAL_LIBS_BUILD_ROOT
 
 
 # url="$base_dir/vendor/wownero"
-# url="https://github.com/wownero/wownero"
-url="https://github.com/fuwa0529/wownero"
+url="https://github.com/wownero/wownero"
 # url="https://github.com/wowario/wownero"
-# version="v0.4.0.0"
-version="0d2ded5"
+version="v0.5.0.0"
+# version="1b5cefa"
 
 
 rm -rf wownero

script/nix/shell.nix

@@ -65,7 +65,7 @@ with nixpkgs;
     graphviz
     pkgconfig
 
-    androidsdk_9_0
+    # androidsdk_9_0
 
     vim
     exiftool
@@ -74,6 +74,7 @@ with nixpkgs;
     autoconf
     automake
     gnum4
+    androidenv.androidPkgs_9_0.platform-tools
   ]
   ++ android-studio-deps
   )
@@ -95,8 +96,8 @@ with nixpkgs;
 
     export _JAVA_AWT_WM_NONREPARENTING=1
 
-    export app_version=1140
-    export gradle_app_version=2x5x0x0
+    export app_version=1170
+    export gradle_app_version=2x5x0x3
     export release_key=~/.android/fuwa-release-key.jks
 
     export USE_CCACHE=1