v0.8.0

iotaledger · Oct 24, 2017 · 899b335 · 899b335
1 parent c0ced50
commit 899b335
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: android
 env:
   global:
-  - BUILD_TOOLS=26.0.1
+  - BUILD_TOOLS=26.0.2
   - ANDROID_SDK=26
   - secure: 2DKJSx0H9YSrvkGuF3nGTXA4qZZZs0Mnj3axD12CvE4AUXPMiwQheSeh5Dwd3W0LV6XfmUI6/nZhZf8I+BJObpBTMV6+Swgt1OR/5A8uksJCbUnsOEHBvhdaZgj9tnbM6KfNUqtJnd/E+/iz8XmuU7CJLT7mR750ERqTwj3aTeFZ7yAJn2tD0Zio+CH9V3Vrs3mTIPYkwFpcdcuikKA0Ix04t1K+3+nEeUPusp8/v+v2ViKYEGdfmxFsHcKHAAVpqgXQzGSfkCMEMpfGP+8T4Y7vfPzgO1KyJm6+3FPMN6+6qJBHcvQz77y9ZQE6z/b29ih4xhxHtyhH8R8l2IT6v46JPuQzg+4YkHpDYJye4ffpmYFqgZaTwYaNcktX2ia6bQgqPtvIDfyGJQ0XMClQhZyOlR5ksClYeypGgZgA6i3V2Zrlsc89a8TgmD6UUEUd28utghuBERff9pBML267eZQ1ylex497Fpt6/YXZATuZG7mPWGMJx3Dr/IhKIbvEcZiqM3JsE7+gnOi7LK9UCXC56jzXhvYt5TH8pWJvZ2w3yL4okKuF4OXDgSG5StCJUlMY0YyJ148LdxAPsF3uxkCYDXuKQK+3J7qA4gGoURlta/KPNNJTvurOkxZXKr+HPPMNwwwo1ofPDQx0JtgmbH6te6yZ/LeuQ2d/ZS/LFjh8=
   - secure: UIs6ZiHdo2KP3+6n2VRKLb1sTQELexQG4Lk34/Dlxj7tGLYTmW7gVQqNnFMuHZAfZvx72cBEC/X5XiVb38fp9saj23AStqokVmEz2ACH0MWXPZzYpfz/cY0oxFoI+TiOiShzbdTh/E6av7rhjmvssqa4bEkECHxFOYtRKm41lMM8vBFK6IHj45uqCl4NxavLtTvvT1gRBpsmILmjh4B25W3HAPdW2+twitR5hS4pYxhm1BEjJRNvFMSqzQFywgZqE2ViMa47KHAE1KV2mMsluguLJzy4u3vvpYB2nhIX8qT294ozzokoy5vPst2TGL9etIyERqO+SlizReFe6JORByOCa9nZmxhYjwZADwGtUHeS9+fy+s9AS7JihC4V5yAwypMIZxVeRmiOz88Z53YnnIn4p6Gi8ZGJUmWBV05cg6MHC8T3J0hMh4WqGBag2nhOXMBZ+Tmu38CVEkHN83x8spbjE4ZuUi77m3fXVdIIRcb/YkVrdidXbg5gDmlh18POHya5garPn9lRPkc9gmIZi9sNBuBAbRu1BOkDXrJjoL7NTlUJwP6RMnL1EzXeAD2KnOOLN4jGOD/uUF2CA12KYmug5Y43ER9TUd/6rDGgT2ZI2uEiTJ6Vbqx8lAcUCJ6JY9m/4sU3sTAvf+z7B6/N1ixh4hlkwb1/TAk1eNb2U60=
@@ -33,7 +33,7 @@ before_deploy:
 - jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore $HOME/keystore.jks
   -storepass $storepass -keypass $keypass app-release-unsigned.apk iotaKey
 - jarsigner -verify app-release-unsigned.apk
-- "${ANDROID_HOME}/build-tools/26.0.1/zipalign -v 4 app-release-unsigned.apk app-release.apk"
+- "${ANDROID_HOME}/build-tools/26.0.2/zipalign -v 4 app-release-unsigned.apk app-release.apk"
 deploy:
   provider: releases
   api_key:

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 def versionMajor = 0
-def versionMinor = 7
-def versionPatch = 4
+def versionMinor = 8
+def versionPatch = 0
 def versionBuild = 0 // bump for dogfood builds, public betas, etc.
 
 //TODO edit the changelog as well
 
 android {
     compileSdkVersion 26
-    buildToolsVersion '26.0.1'
+    buildToolsVersion '26.0.2'
 
     defaultConfig {
         applicationId "org.iota.wallet"
@@ -97,9 +97,9 @@ dependencies {
     //Other libraries
     compile 'org.greenrobot:eventbus:3.0.0'
     compile 'com.google.code.gson:gson:2.8.2'
-    compile 'org.knowm.xchange:xchange-core:4.2.2'
-    compile 'org.knowm.xchange:xchange-bitstamp:4.2.2'
-    compile 'org.knowm.xchange:xchange-bitfinex:4.2.2'
-    compile 'org.knowm.xchange:xchange-okcoin:4.2.2'
-    compile 'com.github.iotaledger:iota.lib.java:v0.9.5'
+    compile 'org.knowm.xchange:xchange-core:4.2.3'
+    compile 'org.knowm.xchange:xchange-bitstamp:4.2.3'
+    compile 'org.knowm.xchange:xchange-bitfinex:4.2.3'
+    compile 'org.knowm.xchange:xchange-okcoin:4.2.3'
+    compile 'com.github.iotaledger:iota.lib.java:0012376'
 }
diff --git a/app/src/main/java/org/iota/wallet/ui/fragment/SettingsNodeFragment.java b/app/src/main/java/org/iota/wallet/ui/fragment/SettingsNodeFragment.java
@@ -58,6 +58,11 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
                     p.setText(Constants.PREFERENCE_NODE_DEFAULT_PROTOCOL);
                     if (getView() != null)
                         Snackbar.make(getView(), R.string.settings_messages_empty_node_protocol, Snackbar.LENGTH_LONG).show();
+                } else if (!nodeProtocol.equals("http") || !nodeProtocol.equals("https")) {
+                    EditTextPreference p = (EditTextPreference) findPreference(key);
+                    p.setText(Constants.PREFERENCE_NODE_DEFAULT_PROTOCOL);
+                    if (getView() != null)
+                        Snackbar.make(getView(), R.string.settings_messages_wrong_node_protocol, Snackbar.LENGTH_LONG).show();
                 }
                 break;
             case Constants.PREFERENCE_NODE_IP:

diff --git a/app/src/main/res/raw/changelog.xml b/app/src/main/res/raw/changelog.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog bulletedList="true">
 
+    <changelogversion
+        changeDate="October 25, 2017"
+        versionName="0.8.0">
+        <changelogtext>Updated dependencies</changelogtext>
+    </changelogversion>
+
     <changelogversion
         changeDate="September 30, 2017"
         versionName="0.7.4">

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -168,6 +168,7 @@
     <string name="settings_wallet_currency_summary">Währung, in der das Wallet-Guthaben angezeigt wird</string>
 
     <string name="settings_messages_empty_node_protocol">Es muss ein Knoten Protokoll angegeben werden.</string>
+    <string name="settings_messages_wrong_node_protocol">Knoten Protokoll nicht erlaubt.</string>
     <string name="settings_messages_empty_node_ip">Es muss eine Knoten IP angegeben werden.</string>
     <string name="settings_messages_empty_node_port">Es muss ein Knoten Port angegeben werden.</string>
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -167,6 +167,7 @@
     <string name="settings_wallet_currency_summary">The currency in which the wallet value is displayed</string>
 
     <string name="settings_messages_empty_node_protocol">Empty node protocol not allowed.</string>
+    <string name="settings_messages_wrong_node_protocol">Node protocol not allowed.</string>
     <string name="settings_messages_empty_node_ip">Empty node IP not allowed.</string>
     <string name="settings_messages_empty_node_port">Empty node port not allowed.</string>