diff options
author | WolFi <wolfi@wolfi.es> | 2017-09-03 00:29:53 +0300 |
---|---|---|
committer | WolFi <wolfi@wolfi.es> | 2017-09-03 00:29:53 +0300 |
commit | a5b824c8fbcab56a1420b6cafd551286933c73db (patch) | |
tree | b727395b471add1846e296ecf6f5f0db916e2dbe | |
parent | 50c030bd9f4449de131a2d12b377f9855ae4be42 (diff) |
ADD more descriptive network errorsv0.13
UPDATE gradle compiler version
UPDATE some other things
FIX trnsiflex annoyance strings for compile
BUMP VERSION
-rwxr-xr-x | SetupOpenssl.sh | 2 | ||||
-rw-r--r-- | app/build.gradle | 4 | ||||
-rw-r--r-- | app/src/main/cpp/SJCL.cpp | 2 | ||||
-rw-r--r-- | app/src/main/java/es/wolfi/passman/API/Core.java | 8 | ||||
-rw-r--r-- | app/src/main/res/values-af/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-ast/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-el/strings.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/values-hu-rHU/strings.xml | 4 | ||||
-rw-r--r-- | build.gradle | 2 |
9 files changed, 23 insertions, 6 deletions
diff --git a/SetupOpenssl.sh b/SetupOpenssl.sh index 38b0eb5..23810ed 100755 --- a/SetupOpenssl.sh +++ b/SetupOpenssl.sh @@ -31,7 +31,7 @@ _ANDROID_ARCH=arch-arm # Android 5.0, there will likely be another platform added (android-22?). # This value is always used. # _ANDROID_API="android-14" -_ANDROID_API="android-18" +_ANDROID_API="android-19" # _ANDROID_API="android-19" ##################################################################### diff --git a/app/build.gradle b/app/build.gradle index 80333a3..fc55de5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,8 +28,8 @@ android { applicationId "es.wolfi.app.passman" minSdkVersion 19 targetSdkVersion 23 - versionCode 4 - versionName "0.12" + versionCode 5 + versionName "0.13" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" externalNativeBuild { cmake { diff --git a/app/src/main/cpp/SJCL.cpp b/app/src/main/cpp/SJCL.cpp index 6d44969..d437d4f 100644 --- a/app/src/main/cpp/SJCL.cpp +++ b/app/src/main/cpp/SJCL.cpp @@ -20,7 +20,7 @@ * */ -#include "SJCL.h"; +#include "SJCL.h" #include <openssl/evp.h> #include <JSON.h> #include "base64.h" diff --git a/app/src/main/java/es/wolfi/passman/API/Core.java b/app/src/main/java/es/wolfi/passman/API/Core.java index f31fa00..61dbf56 100644 --- a/app/src/main/java/es/wolfi/passman/API/Core.java +++ b/app/src/main/java/es/wolfi/passman/API/Core.java @@ -26,6 +26,7 @@ import android.content.Context; import android.content.SharedPreferences; import android.preference.PreferenceManager; import android.util.Base64; +import android.util.Log; import android.widget.Toast; import com.koushikdutta.async.future.FutureCallback; @@ -134,6 +135,10 @@ public abstract class Core { String host = ton.getString(SettingValues.HOST.toString()); String user = ton.getString(SettingValues.USER.toString()); String pass = ton.getString(SettingValues.PASSWORD.toString()); + Toast.makeText(c, host, Toast.LENGTH_LONG).show(); + Log.d(LOG_TAG, "Host: " + host); + Log.d(LOG_TAG, "User: " + user); + Log.d(LOG_TAG, "Pass: " + pass); Vault.setUpAPI(host, user, pass); Vault.getVaults(c, new FutureCallback<HashMap<String, Vault>>() { @@ -151,7 +156,8 @@ public abstract class Core { ret = false; } else { - if (toast) Toast.makeText(c, c.getString(R.string.net_error), Toast.LENGTH_LONG).show(); + Log.e(LOG_TAG, "Error: " + e.getMessage(), e); + if (toast) Toast.makeText(c, c.getString(R.string.net_error) + ": " + e.getMessage(), Toast.LENGTH_LONG).show(); ret = false; } } diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml index f1b82f8..172502d 100644 --- a/app/src/main/res/values-af/strings.xml +++ b/app/src/main/res/values-af/strings.xml @@ -16,6 +16,8 @@ <string name="copied_to_clipboard">Teks na knipbord gekopieer</string> <string name="vault_password">Kluiswagwoord</string> <string name="vault_password_save">Bewaar die kluiswagwoord</string> + <string name="wrongNCUrl">Transiflex sucks</string> + <string name="last_accessed">Transiflex sucks</string> <string name="not_implemented_yet">Nog nie geïmplementeer</string> <string name="created">Geskep:</string> </resources> diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml index 559a191..fd1562f 100644 --- a/app/src/main/res/values-ast/strings.xml +++ b/app/src/main/res/values-ast/strings.xml @@ -18,4 +18,6 @@ <string name="vault_password">Contraseña del bagul</string> <string name="not_implemented_yet">Entá nun s\'implementó</string> <string name="created">Creóse\'l</string> + <string name="last_accessed">Last accessed:</string> + <string name="vault_password_save">Save the vault password</string> </resources> diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index db5a4d8..d492adf 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -7,6 +7,8 @@ <string name="connect">Σύνδεση</string> <string name="wrongNCUrl">Εσφαλμένη διεύθυνσης URL του Nextcloud ή δεν είναι δυνατή η σύνδεση</string> <string name="wrongNCSettings">Λανθασμένες ρυθμίσεις</string> + <string name="vault_password">Vault password</string> + <string name="vault_password_save">Save the vault password</string> <string name="net_error">Σφάλμα δικτύου</string> <string name="unlock">Ξεκλείδωμα</string> <string name="wrong_vault_pw">Λανθασμένος κωδικός πρόσβασης θυσαυροφυλακίου </string> @@ -17,4 +19,5 @@ <string name="copied_to_clipboard">Κείμενο που αντιγράφηκε στο πρόχειρο</string> <string name="created">Δημιουργήθηκε:</string> <string name="last_accessed">Τελευταία προσπέλαση:</string> + <string name="not_implemented_yet">Not implemented yet</string> </resources> diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml index b7de9d9..ccb3956 100644 --- a/app/src/main/res/values-hu-rHU/strings.xml +++ b/app/src/main/res/values-hu-rHU/strings.xml @@ -6,6 +6,10 @@ <string name="password">Jelszó</string> <string name="connect">Kapcsolódás</string> <string name="wrongNCSettings">Hibás beállítások</string> + <string name="wrongNCUrl">Incorrect Nextcloud backend URL or unable to connect</string> + <string name="wrong_vault_pw">Wrong vault password</string> + <string name="not_implemented_yet">Not implemented yet</string> + <string name="vault_password_save">Save the vault password</string> <string name="net_error">Hálózati hiba</string> <string name="unlock">Feloldás</string> <string name="label">Címke</string> diff --git a/build.gradle b/build.gradle index 1ea4bd0..c2eea8e 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0' + classpath 'com.android.tools.build:gradle:2.3.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files |