diffoscope/comparators/apk.py

@@ -227,9 +227,7 @@ class Apksigner(Command):
 class ApkFile(ZipFileBase):
     DESCRIPTION = "Android APK files"
     FILE_TYPE_HEADER_PREFIX = b"PK\x03\x04"
-    FILE_TYPE_RE = re.compile(
-        r"^(Android package|(Java|Zip) archive data|Dalvik dex file)\b"
-    )
+    FILE_TYPE_RE = re.compile(r"^(Android package|(Java|Zip) archive data)\b")
     FILE_EXTENSION_SUFFIX = {".apk"}
     CONTAINER_CLASSES = [ApkContainer, ZipContainer]
 

diffoscope/comparators/dex.py

@@ -60,7 +60,8 @@ class DexContainer(Archive):
 
 class DexFile(File):
     DESCRIPTION = "Dalvik .dex files"
-    FILE_TYPE_RE = re.compile(r"^Dalvik dex file .*\b")
+    FILE_TYPE_HEADER_PREFIX = b"dex\n"
+    FILE_TYPE_RE = re.compile(r"^Dalvik dex file\b")
     FILE_EXTENSION_SUFFIX = {".dex"}
     CONTAINER_CLASSES = [DexContainer]