Merge pull request #20 from tapthaker/master

Fix a bug where all files inside META-INF were skipped instead of the signature files
WindySha · Oct 27, 2024 · d62b314 · d62b314
2 parents 1eddf66 + b241fdd
commit d62b314
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/src/main/java/com/wind/meditor/core/FileProcesser.java b/lib/src/main/java/com/wind/meditor/core/FileProcesser.java
@@ -42,7 +42,8 @@ public static void processApkFile(String srcApkPath, String dstApkPath, Modifica
 //                Log.d(" zipEntryName = " + zipEntryName);
 
                 // ignore signature files, we will resign it.
-                if (zipEntryName.startsWith("META-INF")) {
+                if (FileTypeUtils.isSignatureFile(zipEntryName)) {
+                    Log.i("ignore signature file: " + zipEntryName);
                     continue;
                 }
 

diff --git a/lib/src/main/java/com/wind/meditor/utils/FileTypeUtils.java b/lib/src/main/java/com/wind/meditor/utils/FileTypeUtils.java
@@ -34,6 +34,14 @@ public static boolean isApkFile(String filePath) {
         return false;
     }
 
+    public static boolean isSignatureFile(String filePath) {
+        return filePath.startsWith("META-INF/") && 
+          (filePath.endsWith(".RSA") ||
+           filePath.endsWith(".DSA") ||
+           filePath.endsWith(".SF") ||
+           filePath.endsWith(".MF"));
+    }
+
     public static String getFileHeader(String filePath) {
         String cachedHeader = fileHeaderCache.get(filePath);
         if (cachedHeader != null && !cachedHeader.isEmpty()) {