Skip to content

Backport of #153: ignore unhandled rich objects #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndyScherzinger merged 1 commit into from
Jul 4, 2018
Merged

Backport of #153: ignore unhandled rich objects #154

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions src/com/owncloud/android/lib/resources/activities/models/RichElementTypeAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,26 +95,31 @@ private RichObject readObject(String tag, JsonReader in) throws IOException {
RichObject richObject = new RichObject();
richObject.setTag(tag);
while (in.hasNext()) {
String name = in.nextName();

String name;
try {
name = in.nextName();
} catch (IllegalStateException e) {
name = "";
}

switch (name) {
case "type":
richObject.setType(in.nextString());
richObject.setType(getNextString(in));
break;
case "id":
richObject.setId(in.nextString());
richObject.setId(getNextString(in));
break;
case "name":
richObject.setName(in.nextString());
richObject.setName(getNextString(in));
break;
case "path":
richObject.setPath(in.nextString());
richObject.setPath(getNextString(in));
break;
case "link":
richObject.setLink(in.nextString());
richObject.setLink(getNextString(in));
break;
case "server":
richObject.setLink(in.nextString());
richObject.setLink(getNextString(in));
break;
default:
in.skipValue(); // ignore value
Expand All @@ -124,5 +129,13 @@ private RichObject readObject(String tag, JsonReader in) throws IOException {
in.endObject();
return richObject;
}

private String getNextString(JsonReader in) {
try {
return in.nextString();
} catch (IllegalStateException | IOException e) {
return "";
}
}
}