Merge pull request #630 from nextcloud/backport/619/stable-2.6

[stable-2.6] Activity: preview object now has filename
nextcloud · May 25, 2021 · 1a3c037 · 1a3c037
2 parents 84ee799 + 95a223e
commit 1a3c037
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt
@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: No errors or warnings</span>
+      <span class="mdl-layout-title">Lint Report: 3 warnings</span>
diff --git a/src/main/java/com/owncloud/android/lib/resources/activities/models/PreviewObject.java b/src/main/java/com/owncloud/android/lib/resources/activities/models/PreviewObject.java
@@ -44,4 +44,5 @@ public class PreviewObject {
     private Boolean mimeTypeIcon;
     private String mimeType;
     private String view;
+    private String filename;
 }
diff --git a/src/main/java/com/owncloud/android/lib/resources/activities/models/PreviewObjectAdapter.java b/src/main/java/com/owncloud/android/lib/resources/activities/models/PreviewObjectAdapter.java
@@ -31,6 +31,8 @@
 
 import java.io.IOException;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * PreviewList Parser
  */
@@ -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());
@@ -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;