diff options
author | Marcos Zuriaga <wolfi@wolfi.es> | 2022-09-08 16:58:46 +0300 |
---|---|---|
committer | Marcos Zuriaga <wolfi@wolfi.es> | 2022-09-08 16:58:46 +0300 |
commit | 248d70efdd3ef0bab13be5d3ef9ea8937c9c8d23 (patch) | |
tree | deb54c38f1147a26ef4607934c3e1ec873e9622a | |
parent | b20a01cf152a4d9160fcc9e7f5e40bdd41ace28d (diff) | |
parent | ab99470ac808c0a9a85c435ca1b577e7aa30e3f5 (diff) |
Merge branch 'fix-135'
-rw-r--r-- | app/src/main/java/es/wolfi/app/passman/activities/LoginActivity.java | 1 | ||||
-rw-r--r-- | app/src/main/java/es/wolfi/passman/API/Core.java | 62 |
2 files changed, 33 insertions, 30 deletions
diff --git a/app/src/main/java/es/wolfi/app/passman/activities/LoginActivity.java b/app/src/main/java/es/wolfi/app/passman/activities/LoginActivity.java index 9c154e1..a66bbb6 100644 --- a/app/src/main/java/es/wolfi/app/passman/activities/LoginActivity.java +++ b/app/src/main/java/es/wolfi/app/passman/activities/LoginActivity.java @@ -242,7 +242,6 @@ public class LoginActivity extends AppCompatActivity { ton.removeString(SettingValues.USER.toString()); ton.removeString(SettingValues.PASSWORD.toString()); } - } }); } 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 01572e0..babf4c2 100644 --- a/app/src/main/java/es/wolfi/passman/API/Core.java +++ b/app/src/main/java/es/wolfi/passman/API/Core.java @@ -242,42 +242,44 @@ public abstract class Core { requestInternalAPIGET(c, "version", new FutureCallback<String>() { @Override public void onCompleted(Exception e, String result) { - if (result != null && e == null) { - Log.d("getApiVersion", result); - if (applyVersionJSON(result)) { - OfflineStorage.getInstance().putObject(OfflineStorageValues.VERSION.toString(), result); - OfflineStorage.getInstance().commit(); - cb.onCompleted(null, version_name); - } - } else { - Log.d("getApiVersion", "Failure while getting api version, maybe offline?"); - Log.d("OfflineStorage state", OfflineStorage.getInstance().isEnabled() ? "enabled" : "disabled"); - Log.d("version stored", OfflineStorage.getInstance().has(OfflineStorageValues.VERSION.toString()) ? "yes" : "no"); - if (OfflineStorage.getInstance().isEnabled() && - OfflineStorage.getInstance().has(OfflineStorageValues.VERSION.toString()) && - OfflineStorage.getInstance().has(OfflineStorageValues.VAULTS.toString())) { - showConnectionErrorHint(c); - if (applyVersionJSON(OfflineStorage.getInstance().getString(OfflineStorageValues.VERSION.toString()))) { + try { + if (result != null && e == null) { + Log.d("getApiVersion", result); + if (applyVersionJSON(result)) { + OfflineStorage.getInstance().putObject(OfflineStorageValues.VERSION.toString(), result); + OfflineStorage.getInstance().commit(); cb.onCompleted(null, version_name); - return; } + } else { + Log.d("getApiVersion", "Failure while getting api version, maybe offline?"); + Log.d("OfflineStorage state", OfflineStorage.getInstance().isEnabled() ? "enabled" : "disabled"); + Log.d("version stored", OfflineStorage.getInstance().has(OfflineStorageValues.VERSION.toString()) ? "yes" : "no"); + if (OfflineStorage.getInstance().isEnabled() && + OfflineStorage.getInstance().has(OfflineStorageValues.VERSION.toString()) && + OfflineStorage.getInstance().has(OfflineStorageValues.VAULTS.toString())) { + showConnectionErrorHint(c); + if (applyVersionJSON(OfflineStorage.getInstance().getString(OfflineStorageValues.VERSION.toString()))) { + cb.onCompleted(null, version_name); + return; + } + } + cb.onCompleted(e, null); } - cb.onCompleted(e, null); + } catch (JSONException | NumberFormatException jsonException) { + jsonException.printStackTrace(); + Toast.makeText(c, c.getString(R.string.error_occurred), Toast.LENGTH_SHORT).show(); + cb.onCompleted(jsonException, null); } } }); } - public static boolean applyVersionJSON(String version) { - try { - JSONObject parsedResult = new JSONObject(version); - if (parsedResult.has("version")) { - version_name = parsedResult.getString("version"); - version_number = Integer.parseInt(version_name.replace(".", "")); - return true; - } - } catch (JSONException | NumberFormatException jsonException) { - jsonException.printStackTrace(); + public static boolean applyVersionJSON(String version) throws JSONException, NumberFormatException { + JSONObject parsedResult = new JSONObject(version); + if (parsedResult.has("version")) { + version_name = parsedResult.getString("version"); + version_number = Integer.parseInt(version_name.replace(".", "")); + return true; } return false; } @@ -328,7 +330,7 @@ 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); @@ -358,6 +360,8 @@ public abstract class Core { } ret = false; } + } else { + Toast.makeText(c, host, Toast.LENGTH_LONG).show(); } cb.onCompleted(e, ret); |