capacitor-dex-editor 0.0.16 → 0.0.17

package/android/src/main/java/com/aetherlink/dexeditor/DexManager.java

@@ -29,6 +29,8 @@ import com.android.tools.smali.dexlib2.writer.io.FileDataStore;
 import com.android.tools.smali.dexlib2.writer.pool.DexPool;
 import com.android.tools.smali.baksmali.Baksmali;
 import com.android.tools.smali.baksmali.BaksmaliOptions;
+import com.android.tools.smali.baksmali.Adaptors.ClassDefinition;
+import com.android.tools.smali.baksmali.formatter.BaksmaliWriter;
 import com.android.tools.smali.smali.Smali;
 import com.android.tools.smali.smali.SmaliOptions;
 
@@ -1588,120 +1590,16 @@ public class DexManager {
                 return result;
             }
             
-            // 生成 Smali 代码
-            smali.append(".class ");
-            // 访问标志
-            int accessFlags = targetClass.getAccessFlags();
-            if ((accessFlags & 0x0001) != 0) smali.append("public ");
-            if ((accessFlags & 0x0010) != 0) smali.append("final ");
-            if ((accessFlags & 0x0020) != 0) smali.append("super ");
-            if ((accessFlags & 0x0200) != 0) smali.append("interface ");
-            if ((accessFlags & 0x0400) != 0) smali.append("abstract ");
-            if ((accessFlags & 0x1000) != 0) smali.append("synthetic ");
-            if ((accessFlags & 0x2000) != 0) smali.append("annotation ");
-            if ((accessFlags & 0x4000) != 0) smali.append("enum ");
-            smali.append(targetClass.getType()).append("\n");
+            // 使用 baksmali 库生成正确的 Smali 代码
+            BaksmaliOptions options = new BaksmaliOptions();
+            ClassDefinition classDefinition = new ClassDefinition(options, targetClass);
             
-            // 父类
-            String superClass = targetClass.getSuperclass();
-            if (superClass != null) {
-                smali.append(".super ").append(superClass).append("\n");
-            }
-            
-            // 源文件
-            String sourceFile = targetClass.getSourceFile();
-            if (sourceFile != null) {
-                smali.append(".source \"").append(sourceFile).append("\"\n");
-            }
-            
-            // 实现的接口
-            for (String iface : targetClass.getInterfaces()) {
-                smali.append(".implements ").append(iface).append("\n");
-            }
-            
-            smali.append("\n");
-            
-            // 分离静态字段和实例字段
-            java.util.List<Field> staticFields = new java.util.ArrayList<>();
-            java.util.List<Field> instanceFields = new java.util.ArrayList<>();
-            for (Field field : targetClass.getFields()) {
-                if ((field.getAccessFlags() & 0x0008) != 0) {
-                    staticFields.add(field);
-                } else {
-                    instanceFields.add(field);
-                }
-            }
+            java.io.StringWriter stringWriter = new java.io.StringWriter();
+            BaksmaliWriter writer = new BaksmaliWriter(stringWriter, null);
+            classDefinition.writeTo(writer);
+            writer.close();
             
-            // 静态字段
-            if (!staticFields.isEmpty()) {
-                smali.append("# static fields\n");
-                for (Field field : staticFields) {
-                    smali.append(".field ");
-                    int fFlags = field.getAccessFlags();
-                    if ((fFlags & 0x0001) != 0) smali.append("public ");
-                    if ((fFlags & 0x0002) != 0) smali.append("private ");
-                    if ((fFlags & 0x0004) != 0) smali.append("protected ");
-                    smali.append("static ");
-                    if ((fFlags & 0x0010) != 0) smali.append("final ");
-                    if ((fFlags & 0x0040) != 0) smali.append("volatile ");
-                    if ((fFlags & 0x0080) != 0) smali.append("transient ");
-                    if ((fFlags & 0x1000) != 0) smali.append("synthetic ");
-                    if ((fFlags & 0x4000) != 0) smali.append("enum ");
-                    smali.append(field.getName()).append(":").append(field.getType()).append("\n");
-                }
-                smali.append("\n");
-            }
-            
-            // 实例字段
-            if (!instanceFields.isEmpty()) {
-                smali.append("# instance fields\n");
-                for (Field field : instanceFields) {
-                    smali.append(".field ");
-                    int fFlags = field.getAccessFlags();
-                    if ((fFlags & 0x0001) != 0) smali.append("public ");
-                    if ((fFlags & 0x0002) != 0) smali.append("private ");
-                    if ((fFlags & 0x0004) != 0) smali.append("protected ");
-                    if ((fFlags & 0x0010) != 0) smali.append("final ");
-                    if ((fFlags & 0x0040) != 0) smali.append("volatile ");
-                    if ((fFlags & 0x0080) != 0) smali.append("transient ");
-                    if ((fFlags & 0x1000) != 0) smali.append("synthetic ");
-                    if ((fFlags & 0x4000) != 0) smali.append("enum ");
-                    smali.append(field.getName()).append(":").append(field.getType()).append("\n");
-                }
-                smali.append("\n");
-            }
-            
-            // 分离直接方法和虚拟方法
-            java.util.List<Method> directMethods = new java.util.ArrayList<>();
-            java.util.List<Method> virtualMethods = new java.util.ArrayList<>();
-            for (Method method : targetClass.getMethods()) {
-                int mFlags = method.getAccessFlags();
-                // direct methods: private, static, constructor
-                if ((mFlags & 0x0002) != 0 || (mFlags & 0x0008) != 0 || 
-                    method.getName().equals("<init>") || method.getName().equals("<clinit>")) {
-                    directMethods.add(method);
-                } else {
-                    virtualMethods.add(method);
-                }
-            }
-            
-            // 直接方法
-            if (!directMethods.isEmpty()) {
-                smali.append("\n# direct methods\n");
-                for (Method method : directMethods) {
-                    outputMethod(smali, method);
-                }
-            }
-            
-            // 虚拟方法
-            if (!virtualMethods.isEmpty()) {
-                smali.append("\n# virtual methods\n");
-                for (Method method : virtualMethods) {
-                    outputMethod(smali, method);
-                }
-            }
-            
-            result.put("smali", smali.toString());
+            result.put("smali", stringWriter.toString());
             
         } finally {
             if (dexInputStream != null) {
@@ -1715,179 +1613,6 @@ public class DexManager {
         return result;
     }
 
-    /**
-     * 输出单个方法的 Smali 代码 (MT 风格)
-     */
-    private void outputMethod(StringBuilder smali, Method method) {
-        smali.append(".method ");
-        int mFlags = method.getAccessFlags();
-        if ((mFlags & 0x0001) != 0) smali.append("public ");
-        if ((mFlags & 0x0002) != 0) smali.append("private ");
-        if ((mFlags & 0x0004) != 0) smali.append("protected ");
-        if ((mFlags & 0x0008) != 0) smali.append("static ");
-        if ((mFlags & 0x0010) != 0) smali.append("final ");
-        if ((mFlags & 0x0020) != 0) smali.append("synchronized ");
-        if ((mFlags & 0x0040) != 0) smali.append("bridge ");
-        if ((mFlags & 0x0080) != 0) smali.append("varargs ");
-        if ((mFlags & 0x0100) != 0) smali.append("native ");
-        if ((mFlags & 0x0400) != 0) smali.append("abstract ");
-        if ((mFlags & 0x0800) != 0) smali.append("strictfp ");
-        if ((mFlags & 0x1000) != 0) smali.append("synthetic ");
-        if ((mFlags & 0x10000) != 0) smali.append("constructor ");
-        if ((mFlags & 0x20000) != 0) smali.append("declared-synchronized ");
-        
-        smali.append(method.getName());
-        smali.append("(");
-        for (CharSequence param : method.getParameterTypes()) {
-            smali.append(param);
-        }
-        smali.append(")");
-        smali.append(method.getReturnType());
-        smali.append("\n");
-        
-        MethodImplementation impl = method.getImplementation();
-        if (impl != null) {
-            smali.append("    .registers ").append(impl.getRegisterCount()).append("\n\n");
-            
-            // 输出指令，跟踪标签位置
-            java.util.Map<Integer, String> labelMap = new java.util.HashMap<>();
-            int codeOffset = 0;
-            
-            // 第一遍：收集所有标签位置
-            for (Instruction instruction : impl.getInstructions()) {
-                if (instruction instanceof com.android.tools.smali.dexlib2.iface.instruction.OffsetInstruction) {
-                    com.android.tools.smali.dexlib2.iface.instruction.OffsetInstruction offInstr = 
-                        (com.android.tools.smali.dexlib2.iface.instruction.OffsetInstruction) instruction;
-                    int targetOffset = codeOffset + offInstr.getCodeOffset();
-                    labelMap.put(targetOffset, ":cond_" + Integer.toHexString(targetOffset));
-                }
-                codeOffset += instruction.getCodeUnits();
-            }
-            
-            // 第二遍：输出指令 (MT 风格：每条指令后有空行)
-            codeOffset = 0;
-            for (Instruction instruction : impl.getInstructions()) {
-                // 输出标签（如果有）
-                if (labelMap.containsKey(codeOffset)) {
-                    smali.append("\n    ").append(labelMap.get(codeOffset)).append("\n");
-                }
-                
-                smali.append("    ").append(instruction.getOpcode().name.toLowerCase().replace('_', '-'));
-                String params = formatInstruction(instruction);
-                if (!params.isEmpty()) {
-                    smali.append(" ").append(params);
-                }
-                smali.append("\n\n");  // MT 风格：每条指令后有空行
-                
-                codeOffset += instruction.getCodeUnits();
-            }
-        }
-        
-        smali.append(".end method\n");
-    }
-
-    /**
-     * 格式化指令参数 - 使用正确的 Smali 语法格式
-     * invoke 指令格式: invoke-xxx {v0, v1}, Lclass;->method()V
-     */
-    private String formatInstruction(Instruction instruction) {
-        StringBuilder sb = new StringBuilder();
-        String opName = instruction.getOpcode().name.toLowerCase();
-        boolean isInvokeOrFilled = opName.startsWith("invoke") || opName.startsWith("filled-new-array");
-        
-        // 收集寄存器
-        java.util.List<Integer> registers = new java.util.ArrayList<>();
-        
-        // 处理多寄存器指令 (invoke 指令使用 FiveRegisterInstruction)
-        if (instruction instanceof com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction) {
-            com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction regInstr = 
-                (com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction) instruction;
-            int regCount = regInstr.getRegisterCount();
-            if (regCount >= 1) registers.add(regInstr.getRegisterC());
-            if (regCount >= 2) registers.add(regInstr.getRegisterD());
-            if (regCount >= 3) registers.add(regInstr.getRegisterE());
-            if (regCount >= 4) registers.add(regInstr.getRegisterF());
-            if (regCount >= 5) registers.add(regInstr.getRegisterG());
-        } else if (instruction instanceof com.android.tools.smali.dexlib2.iface.instruction.RegisterRangeInstruction) {
-            com.android.tools.smali.dexlib2.iface.instruction.RegisterRangeInstruction regInstr = 
-                (com.android.tools.smali.dexlib2.iface.instruction.RegisterRangeInstruction) instruction;
-            int start = regInstr.getStartRegister();
-            int count = regInstr.getRegisterCount();
-            for (int i = 0; i < count; i++) {
-                registers.add(start + i);
-            }
-        } else {
-            // 处理普通寄存器指令
-            if (instruction instanceof com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction) {
-                com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction regInstr = 
-                    (com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction) instruction;
-                registers.add(regInstr.getRegisterA());
-            }
-            
-            if (instruction instanceof com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction) {
-                com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction regInstr = 
-                    (com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction) instruction;
-                registers.add(regInstr.getRegisterB());
-            }
-            
-            if (instruction instanceof com.android.tools.smali.dexlib2.iface.instruction.ThreeRegisterInstruction) {
-                com.android.tools.smali.dexlib2.iface.instruction.ThreeRegisterInstruction regInstr = 
-                    (com.android.tools.smali.dexlib2.iface.instruction.ThreeRegisterInstruction) instruction;
-                registers.add(regInstr.getRegisterC());
-            }
-        }
-        
-        // 格式化寄存器部分
-        if (!registers.isEmpty()) {
-            if (isInvokeOrFilled) {
-                // invoke 指令使用 {} 包裹寄存器
-                sb.append("{");
-                for (int i = 0; i < registers.size(); i++) {
-                    if (i > 0) sb.append(", ");
-                    sb.append("v").append(registers.get(i));
-                }
-                sb.append("}");
-            } else {
-                // 普通指令直接列出寄存器
-                for (int i = 0; i < registers.size(); i++) {
-                    if (i > 0) sb.append(", ");
-                    sb.append("v").append(registers.get(i));
-                }
-            }
-        }
-        
-        // 处理引用指令
-        if (instruction instanceof com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction) {
-            com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction refInstr = 
-                (com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction) instruction;
-            if (sb.length() > 0) sb.append(", ");
-            sb.append(refInstr.getReference().toString());
-        }
-        
-        // 处理字面量指令
-        if (instruction instanceof com.android.tools.smali.dexlib2.iface.instruction.WideLiteralInstruction) {
-            com.android.tools.smali.dexlib2.iface.instruction.WideLiteralInstruction litInstr = 
-                (com.android.tools.smali.dexlib2.iface.instruction.WideLiteralInstruction) instruction;
-            if (sb.length() > 0) sb.append(", ");
-            sb.append("0x").append(Long.toHexString(litInstr.getWideLiteral()));
-        } else if (instruction instanceof com.android.tools.smali.dexlib2.iface.instruction.NarrowLiteralInstruction) {
-            com.android.tools.smali.dexlib2.iface.instruction.NarrowLiteralInstruction litInstr = 
-                (com.android.tools.smali.dexlib2.iface.instruction.NarrowLiteralInstruction) instruction;
-            if (sb.length() > 0) sb.append(", ");
-            sb.append("0x").append(Integer.toHexString(litInstr.getNarrowLiteral()));
-        }
-        
-        // 处理偏移指令
-        if (instruction instanceof com.android.tools.smali.dexlib2.iface.instruction.OffsetInstruction) {
-            com.android.tools.smali.dexlib2.iface.instruction.OffsetInstruction offInstr = 
-                (com.android.tools.smali.dexlib2.iface.instruction.OffsetInstruction) instruction;
-            if (sb.length() > 0) sb.append(", ");
-            sb.append(":label_").append(offInstr.getCodeOffset());
-        }
-        
-        return sb.toString();
-    }
-
     /**
      * 保存修改后的 Smali 代码到 APK 中的 DEX 文件
      * 注意：这是一个复杂操作，需要重新编译 Smali 并修改 DEX 文件

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-dex-editor",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "description": "Capacitor-plugin-for-editing-DEX-files-in-APK",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",