Browse Source

Merge pull request #5772 from nextcloud/wrongTextOpening

First use preferred mimetypes, then editor for optional mimetypes
Andy Scherzinger 5 years ago
parent
commit
61c8cd76dd
1 changed files with 7 additions and 1 deletions
  1. 7 1
      src/main/java/com/owncloud/android/files/FileMenuFilter.java

+ 7 - 1
src/main/java/com/owncloud/android/files/FileMenuFilter.java

@@ -315,7 +315,13 @@ public class FileMenuFilter {
         DirectEditing directEditing = new Gson().fromJson(json, DirectEditing.class);
         DirectEditing directEditing = new Gson().fromJson(json, DirectEditing.class);
 
 
         for (Editor editor : directEditing.editors.values()) {
         for (Editor editor : directEditing.editors.values()) {
-            if (editor.mimetypes.contains(mimeType) || editor.optionalMimetypes.contains(mimeType)) {
+            if (editor.mimetypes.contains(mimeType)) {
+                return editor;
+            }
+        }
+
+        for (Editor editor : directEditing.editors.values()) {
+            if (editor.optionalMimetypes.contains(mimeType)) {
                 return editor;
                 return editor;
             }
             }
         }
         }