improve file type detection logic

Simon-Laux · Jul 17, 2020 · d21bee4 · d21bee4
1 parent 462cad7
commit d21bee4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -8,6 +8,7 @@ Version code **7**
 - On long click on a image it redirect to a bot
 - Save the progress on the page in rotations
 - Add retro style
+- improve file type detection logic
 
 ## 1.4.0 
 Version code **6**

diff --git a/app/src/main/java/de/simonlaux/ziphtmlviewer/OpenActivity.java b/app/src/main/java/de/simonlaux/ziphtmlviewer/OpenActivity.java
@@ -133,7 +133,11 @@ private void handleIntent() {
         try {
             InputStream inputStream = getContentResolver().openInputStream(uri);
             if (uri.getPath() != null) {
-                if (!uri.getPath().contains("zip")) {
+                String path = uri.getPath();
+                if (path.endsWith(".html.zip") || path.endsWith(".htmlzip")) {
+                    // zip html mode
+                    text = getStringFromZip(inputStream);
+                } else {
                     // load file into memory (html or markdown)
                     ByteArrayOutputStream result = new ByteArrayOutputStream();
                     byte[] buffer = new byte[1024];
@@ -142,13 +146,10 @@ private void handleIntent() {
                         result.write(buffer, 0, length);
                     }
                     text = result.toString();
-                    if (uri.getPath().contains("md")) {
+                    if (path.endsWith(".md")) {
                         // markdown mode
                         isMarkdown = true;
                     }
-                } else {
-                    // zip html mode
-                    text = getStringFromZip(inputStream);
                 }
             }
         } catch (IOException e) {