diff options
author | desperateCoder <echotodevnull@gmail.com> | 2020-05-17 14:04:14 +0300 |
---|---|---|
committer | desperateCoder <echotodevnull@gmail.com> | 2020-05-17 14:04:19 +0300 |
commit | f8b78df01b11b4230b8f6f93c096379ea9f5991c (patch) | |
tree | 6df0d63896b06b16321cf2567f3f94db308ee423 /app/src/main/java/it/niedermann/nextcloud/deck/api | |
parent | 887a3a5c94f81a1afae0b593a785f36e50d26faf (diff) |
improved error messages for capability endpoint
Diffstat (limited to 'app/src/main/java/it/niedermann/nextcloud/deck/api')
-rw-r--r-- | app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java index 9a8bfc05a..0710eba54 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java @@ -341,22 +341,25 @@ public class JsonToEntityParser { if (deck.has("version")) { version = deck.get("version").getAsString(); if (version == null || version.trim().length() < 1) { - throw new ServerAppVersionNotParsableException("capabilities endpoint returned an invalid version string: \"" + version + "\""); + throw new ServerAppVersionNotParsableException(ServerAppVersionNotParsableException.Hint.CAPABILITIES_VERSION_NOT_PARSABLE, + "capabilities endpoint returned an invalid version string: \"" + version + "\""); } } else { - throw new ServerAppVersionNotParsableException("deck version node is missing in capabilities endpoint! deck-node: "+deck.getAsString()); + throw new ServerAppVersionNotParsableException(ServerAppVersionNotParsableException.Hint.CAPABILITIES_VERSION_NOT_PARSABLE, + "deck version node is missing in capabilities endpoint! deck-node: "+deck.getAsString()); } } else { - throw new ServerAppVersionNotParsableException("deck node is missing in capabilities endpoint!"); + throw new ServerAppVersionNotParsableException(ServerAppVersionNotParsableException.Hint.CAPABILITIES_NOT_PARSABLE, + "deck node is missing in capabilities endpoint!"); } if (caps.has("theming")) { JsonObject theming = caps.getAsJsonObject("theming"); capabilities.setColor(theming.get("color").getAsString()); capabilities.setTextColor(theming.get("color-text").getAsString()); } - } - if (version == null || version.trim().length() < 1) { - throw new ServerAppVersionNotParsableException("capabilities endpoint returned no version string at all!"); + } else { + throw new ServerAppVersionNotParsableException(ServerAppVersionNotParsableException.Hint.CAPABILITIES_NOT_PARSABLE, + "capabilities node is missing in capabilities endpoint!"); } capabilities.setDeckVersion(Version.of(version)); } |