清除无用代理类等

Author: maoabc

nmm-protect/apkprotect/src/main/java/com/nmmedit/apkprotect/ApkProtect.java

@@ -361,7 +361,7 @@ private static List<String> getApplicationClassesFromMainDex(GlobalDexConfig glo
         for (DexConfig config : globalConfig.getConfigs()) {
             DexBackedDexFile dexFile = DexBackedDexFile.fromInputStream(
                     Opcodes.getDefault(),
-                    new BufferedInputStream(new FileInputStream(config.getNativeDexFile())));
+                    new BufferedInputStream(new FileInputStream(config.getShellDexFile())));
             final Set<? extends DexBackedClassDef> classes = dexFile.getClasses();
             ClassDef classDef;
             while (true) {
@@ -419,7 +419,7 @@ private static List<File> injectInstructionAndWriteToFile(GlobalDexConfig global
 
             DexBackedDexFile dexNativeFile = DexBackedDexFile.fromInputStream(
                     Opcodes.getDefault(),
-                    new BufferedInputStream(new FileInputStream(config.getNativeDexFile())));
+                    new BufferedInputStream(new FileInputStream(config.getShellDexFile())));
 
             for (ClassDef classDef : dexNativeFile.getClasses()) {
                 if (mainClassSet.contains(classDef.getType())) {

nmm-protect/apkprotect/src/main/java/com/nmmedit/apkprotect/dex2c/Dex2c.java

@@ -189,13 +189,13 @@ public static DexConfig handleDex(InputStream dex,
 
 
         //写入需要运行的dex
-        nativeMethodDexPool.writeTo(new FileDataStore(config.getNativeDexFile()));
+        nativeMethodDexPool.writeTo(new FileDataStore(config.getShellDexFile()));
         //写入符号dex
-        symDexPool.writeTo(new FileDataStore(config.getSymbolDexFile()));
+        symDexPool.writeTo(new FileDataStore(config.getImplDexFile()));
 
 
         final DexBackedDexFile symDexFile = DexBackedDexFile.fromInputStream(Opcodes.getDefault(),
-                new BufferedInputStream(new FileInputStream(config.getSymbolDexFile())));
+                new BufferedInputStream(new FileInputStream(config.getImplDexFile())));
 
         //根据符号dex生成c代码
         try (FileWriter nativeCodeWriter = new FileWriter(config.getNativeFunctionsFile());
@@ -244,7 +244,7 @@ public static List<DexPool> injectCallRegisterNativeInsns(DexConfig config,
 
         DexBackedDexFile dexNativeFile = DexBackedDexFile.fromInputStream(
                 Opcodes.getDefault(),
-                new BufferedInputStream(new FileInputStream(config.getNativeDexFile())));
+                new BufferedInputStream(new FileInputStream(config.getShellDexFile())));
 
         List<DexPool> dexPools = new ArrayList<>();
         dexPools.add(lastDexPool);
@@ -265,7 +265,7 @@ public static List<DexPool> injectCallRegisterNativeInsns(DexConfig config,
     }
 
     public static void internClass(DexConfig config, DexPool dexPool, ClassDef classDef) {
-        final Set<String> classes = config.getNativeClasses();
+        final Set<String> classes = config.getHandledNativeClasses();
         final String type = classDef.getType();
         final String className = type.substring(1, type.length() - 1);
         if (classes.contains(className)) {

nmm-protect/apkprotect/src/main/java/com/nmmedit/apkprotect/dex2c/DexConfig.java

@@ -16,7 +16,7 @@ public class DexConfig {
 
 
     //jnicodegenerator 处理完成后,缓存已处理的类及方法
-    private Set<String> nativeClasses;
+    private Set<String> handledNativeClasses;
     private Map<String, Integer> nativeMethodOffsets;
 
     public DexConfig(File outputDir, String dexFileName) {
@@ -47,32 +47,32 @@ public String getRegisterNativesMethodName() {
     }
 
     @Nonnull
-    public Set<String> getNativeClasses() {
-        return nativeClasses;
+    public Set<String> getHandledNativeClasses() {
+        return handledNativeClasses;
     }
 
     public int getOffsetFromClassName(String className) {
         return nativeMethodOffsets.get(className);
     }
 
     public void setResult(JniCodeGenerator codeGenerator) {
-        nativeClasses = codeGenerator.getNativeClasses();
+        handledNativeClasses = codeGenerator.getHandledNativeClasses();
         nativeMethodOffsets = codeGenerator.getNativeMethodOffsets();
     }
 
 
     /**
      * 方法被标识为native的dex,用于替换原dex
      */
-    public File getNativeDexFile() {
-        return new File(outputDir, dexName + "_native.dex");
+    public File getShellDexFile() {
+        return new File(outputDir, dexName + "_shell.dex");
     }
 
     /**
-     * 符号dex文件,用于生成c代码
+     * 符号及方法实现dex文件,用于生成c代码
      */
-    public File getSymbolDexFile() {
-        return new File(outputDir, dexName + "_sym.dex");
+    public File getImplDexFile() {
+        return new File(outputDir, dexName + "_impl.dex");
     }
 
     /**

nmm-protect/apkprotect/src/main/java/com/nmmedit/apkprotect/dex2c/converter/JniCodeGenerator.java

@@ -26,7 +26,9 @@ public class JniCodeGenerator {
 
 
     private final boolean isRegisterNative;
-    private final HashMultimap<String, MyMethod> nativeMethods = HashMultimap.create();
+
+    private final HashMultimap<String, MyMethod> handledNativeMethods = HashMultimap.create();
+
     private final Map<String, Integer> nativeMethodOffsets = new HashMap<>();
     private final ResolverCodeGenerator resolverCodeGenerator;
     private final InstructionRewriter instructionRewriter;
@@ -62,7 +64,7 @@ public void addMethod(Method method, Writer writer) throws IOException {
 
         String clazzName = classType.substring(1, classType.length() - 1);
 
-        nativeMethods.put(clazzName, new MyMethod(clazzName, methodName, parameterTypes, returnType));
+        handledNativeMethods.put(clazzName, new MyMethod(clazzName, methodName, parameterTypes, returnType));
 
         writer.write(String.format("%s %s %s(JNIEnv *env, %s ",
                 isRegisterNative ? "static" : "JNIEXPORT",
@@ -223,8 +225,8 @@ public void addMethod(Method method, Writer writer) throws IOException {
     }
 
 
-    public Set<String> getNativeClasses() {
-        return nativeMethods.keySet();
+    public Set<String> getHandledNativeClasses() {
+        return handledNativeMethods.keySet();
     }
 
     //必须在产生代码后调用才有效果
@@ -319,10 +321,10 @@ private void generateNativeMethodCode(DexConfig config, Writer writer) throws IO
 
         int methodIdx = 0;
         writer.write("static const MyNativeMethod gNativeMethods[] = {\n");
-        for (String clazz : nativeMethods.keySet()) {
+        for (String clazz : handledNativeMethods.keySet()) {
 
             int startIdx = methodIdx;
-            Set<MyMethod> methods = nativeMethods.get(clazz);
+            Set<MyMethod> methods = handledNativeMethods.get(clazz);
             for (MyMethod method : methods) {
                 int nameIdx = resolverCodeGenerator.getIndexByString(method.name);
                 int sigIdx = resolverCodeGenerator.getIndexByString(MyMethodUtil.getMethodSignature(method.parameterTypes, method.returnType));