Fix java.lang.ClassCastException in verifyV1Signature (#37)

java.lang.ClassCastException: Cannot cast android.content.pm.PackageParser$SigningDetails to android.util.apk.ApkSignatureVerifier$SigningDetailsWithDigests Signed-off-by: sekaiacg <[email protected]>
LSPosed · Dec 9, 2021 · 204ba1d · 204ba1d
1 parent b4102e3
commit 204ba1d
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/app/src/main/java/toolkit/coderstory/CorePatchForR.java b/app/src/main/java/toolkit/coderstory/CorePatchForR.java
@@ -16,6 +16,7 @@
 import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;
 import java.util.List;
+import java.util.Map;
 import java.util.zip.ZipEntry;
 
 import de.robv.android.xposed.IXposedHookLoadPackage;
@@ -152,14 +153,23 @@ public void afterHookedMethod(MethodHookParam methodHookParam) throws Throwable
                             signingDetailsArgs[0] = lastSigs;
                         } else {
                             signingDetailsArgs[0] = new Signature[]{new Signature(SIGNATURE)};
-                            }
-                            final Object newInstance = findConstructorExact.newInstance(signingDetailsArgs);
-                            Throwable cause = throwable.getCause();
-                            if (throwable.getClass() == packageParserException) {
-                                if (error.getInt(throwable) == -103) {
-                                    methodHookParam.setResult(newInstance);
-                                }
-                            }
+                        }
+                        Object newInstance = findConstructorExact.newInstance(signingDetailsArgs);
+
+                        //修复 java.lang.ClassCastException: Cannot cast android.content.pm.PackageParser$SigningDetails to android.util.apk.ApkSignatureVerifier$SigningDetailsWithDigests
+                        Class<?> signingDetailsWithDigests = XposedHelpers.findClassIfExists("android.util.apk.ApkSignatureVerifier.SigningDetailsWithDigests", loadPackageParam.classLoader);
+                        if (signingDetailsWithDigests != null) {
+                            Constructor<?> signingDetailsWithDigestsConstructorExact = XposedHelpers.findConstructorExact(signingDetailsWithDigests, signingDetails, Map.class);
+                            signingDetailsWithDigestsConstructorExact.setAccessible(true);
+                            newInstance = signingDetailsWithDigestsConstructorExact.newInstance(new Object[]{newInstance, null});
+                        }
+
+                        Throwable cause = throwable.getCause();
+                        if (throwable.getClass() == packageParserException) {
+                            if (error.getInt(throwable) == -103) {
+                                methodHookParam.setResult(newInstance);
+                             }
+                        }
                         if (cause != null && cause.getClass() == packageParserException) {
                             if (error.getInt(cause) == -103) {
                                 methodHookParam.setResult(newInstance);