ensure a zip file by file content.

skylot · Nov 8, 2016 · fe03c85 · fe03c85
1 parent c338652
commit fe03c85
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 11 deletions.
diff --git a/jadx-core/src/main/java/jadx/core/utils/files/FileUtils.java b/jadx-core/src/main/java/jadx/core/utils/files/FileUtils.java
@@ -11,6 +11,8 @@
 import java.io.OutputStream;
 import java.util.jar.JarEntry;
 import java.util.jar.JarOutputStream;
+import java.util.zip.ZipException;
+import java.util.zip.ZipFile;
 
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
@@ -100,4 +102,22 @@ public static File prepareFile(File file) {
 		makeDirsForFile(file);
 		return file;
 	}
+
+	public static boolean isZipFile(final File file) throws IOException {
+		ZipFile zipFile = null;
+		try {
+			zipFile = new ZipFile(file);
+			return zipFile.entries().hasMoreElements();
+		} catch (ZipException e) {
+			return false;
+		} finally {
+			if (zipFile != null) {
+				try {
+					zipFile.close();
+				} catch (IOException e) {
+					LOG.error(e.getMessage());
+				}
+			}
+		}
+	}
 }
diff --git a/jadx-core/src/main/java/jadx/core/utils/files/InputFile.java b/jadx-core/src/main/java/jadx/core/utils/files/InputFile.java
@@ -52,20 +52,19 @@ private void searchDexFiles() throws IOException, DecodeException {
 			addDexFile(loadFromClassFile(file));
 			return;
 		}
-		if (fileName.endsWith(".apk") || fileName.endsWith(".zip")) {
-			loadFromZip(".dex");
-			return;
-		}
-		if (fileName.endsWith(".jar")) {
-			// check if jar contains '.dex' files
+		if (FileUtils.isZipFile(file)) {
+			// check if zip contains '.dex' files
 			if (loadFromZip(".dex")) {
 				return;
 			}
-			addDexFile(loadFromJar(file));
-			return;
-		}
-		if (fileName.endsWith(".aar")) {
-			loadFromZip(".jar");
+			if (fileName.endsWith(".jar")) {
+				addDexFile(loadFromJar(file));
+				return;
+			}
+			if (fileName.endsWith(".aar")) {
+				loadFromZip(".jar");
+				return;
+			}
 			return;
 		}
 		//throw new DecodeException("Unsupported input file format: " + file);