Skip to content

Activity: preview object now has filename #619

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
tobiasKaminsky merged 1 commit into from
May 12, 2021
+16 −12
Merged

Activity: preview object now has filename #619

Show file tree
Hide file tree
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
11 changes: 1 addition & 10 deletions .idea/codeStyles/Project.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/main/java/com/owncloud/android/lib/resources/activities/models/PreviewObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,5 @@ public class PreviewObject {
private Boolean mimeTypeIcon;
private String mimeType;
private String view;
private String filename;
}
16 changes: 14 additions & 2 deletions src/main/java/com/owncloud/android/lib/resources/activities/models/PreviewObjectAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@

import java.io.IOException;

import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

/**
* PreviewList Parser
*/
Expand Down Expand Up @@ -59,13 +61,20 @@ public PreviewObject read(JsonReader in) throws IOException {
return preview;
}

@SuppressFBWarnings(value = "SF_SWITCH_NO_DEFAULT",
justification = "default case is not found correctly")
private PreviewObject readObject(JsonReader in) throws IOException {
String tag;
PreviewObject preview = new PreviewObject();

do {
tag = in.nextName();

try {
tag = in.nextName();
} catch (IllegalStateException e) {
in.skipValue();
tag = "";
}

switch (tag) {
case "source":
preview.setSource(in.nextString());
Expand All @@ -91,6 +100,9 @@ private PreviewObject readObject(JsonReader in) throws IOException {
preview.setView(in.nextString());
break;

case "filename":
preview.setFilename(in.nextString());

default:
// do nothing
break;
Expand Down