From 58b6677ece99a0aee4ab27e2c72d3a2c85a35bfe Mon Sep 17 00:00:00 2001 From: Nullptr Date: Wed, 8 Sep 2021 19:42:46 +0800 Subject: [PATCH] Add logs & Remove original v1 signature files correctly --- .../main/java/org/lsposed/lspatch/loader/LSPApplication.java | 2 ++ core | 2 +- patch/src/main/java/org/lsposed/patch/LSPatch.java | 3 +-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/lsposed/lspatch/loader/LSPApplication.java b/app/src/main/java/org/lsposed/lspatch/loader/LSPApplication.java index f3b515d..5bcd573 100644 --- a/app/src/main/java/org/lsposed/lspatch/loader/LSPApplication.java +++ b/app/src/main/java/org/lsposed/lspatch/loader/LSPApplication.java @@ -240,11 +240,13 @@ public class LSPApplication extends ApplicationServiceClient { PackageInfo packageInfo = PackageInfo.CREATOR.createFromParcel(out); if (packageInfo.packageName.equals(context.getApplicationInfo().packageName)) { if (packageInfo.signatures != null && packageInfo.signatures.length > 0) { + XLog.d(TAG, "replace signature info [0]"); packageInfo.signatures[0] = new Signature(originalSignature); } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { if (packageInfo.signingInfo != null) { + XLog.d(TAG, "replace signature info [1]"); Signature[] signaturesArray = packageInfo.signingInfo.getApkContentsSigners(); if (signaturesArray != null && signaturesArray.length > 0) { signaturesArray[0] = new Signature(originalSignature); diff --git a/core b/core index 8c96190..415f8e0 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 8c96190a8ebfa45bcf08f98b0bb374d35e0c00d6 +Subproject commit 415f8e03c849cff89c66d258879e079587349418 diff --git a/patch/src/main/java/org/lsposed/patch/LSPatch.java b/patch/src/main/java/org/lsposed/patch/LSPatch.java index 8b153ea..3cbf126 100644 --- a/patch/src/main/java/org/lsposed/patch/LSPatch.java +++ b/patch/src/main/java/org/lsposed/patch/LSPatch.java @@ -323,8 +323,7 @@ public class LSPatch { if (name.startsWith("classes") && name.endsWith(".dex")) continue; if (dstZFile.get(name) != null) continue; if (name.equals("AndroidManifest.xml")) continue; - if (name.startsWith("META-INF/CERT")) continue; - if (name.equals("META-INF/MANIFEST.MF")) continue; + if (name.startsWith("META-INF") && (name.endsWith(".SF") || name.endsWith(".MF") || name.endsWith(".RSA"))) continue; srcZFile.addFileLink(name, name); }