capacitor-dex-editor 0.0.7 → 0.0.9

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

@@ -1306,29 +1306,49 @@ public class DexManager {
             // 解析 DEX 文件
             DexBackedDexFile dexFile = new DexBackedDexFile(Opcodes.getDefault(), dexBytes);
             
-            // 收集字符串
+            // 从类和方法中提取所有字符串引用
             Set<String> uniqueStrings = new HashSet<>();
             int index = 0;
             
             for (ClassDef classDef : dexFile.getClasses()) {
-                // 从方法中提取字符串
+                // 添加类名
+                String className = classDef.getType();
+                if (className != null && !uniqueStrings.contains(className)) {
+                    uniqueStrings.add(className);
+                }
+                
+                // 从字段中提取
+                for (Field field : classDef.getFields()) {
+                    String fieldName = field.getName();
+                    String fieldType = field.getType();
+                    if (fieldName != null && !uniqueStrings.contains(fieldName)) {
+                        uniqueStrings.add(fieldName);
+                    }
+                    if (fieldType != null && !uniqueStrings.contains(fieldType)) {
+                        uniqueStrings.add(fieldType);
+                    }
+                }
+                
+                // 从方法中提取
                 for (Method method : classDef.getMethods()) {
+                    String methodName = method.getName();
+                    if (methodName != null && !uniqueStrings.contains(methodName)) {
+                        uniqueStrings.add(methodName);
+                    }
+                    
+                    // 从方法实现中提取字符串常量
                     MethodImplementation impl = method.getImplementation();
                     if (impl != null) {
                         for (Instruction instruction : impl.getInstructions()) {
-                            String instrStr = instruction.toString();
-                            // 提取字符串常量
-                            if (instrStr.contains("\"")) {
-                                int start = instrStr.indexOf("\"");
-                                int end = instrStr.lastIndexOf("\"");
-                                if (start != -1 && end > start) {
-                                    String str = instrStr.substring(start + 1, end);
-                                    if (!uniqueStrings.contains(str)) {
+                            // 检查是否是字符串引用指令
+                            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;
+                                com.android.tools.smali.dexlib2.iface.reference.Reference ref = refInstr.getReference();
+                                if (ref instanceof com.android.tools.smali.dexlib2.iface.reference.StringReference) {
+                                    String str = ((com.android.tools.smali.dexlib2.iface.reference.StringReference) ref).getString();
+                                    if (str != null && !uniqueStrings.contains(str)) {
                                         uniqueStrings.add(str);
-                                        JSObject item = new JSObject();
-                                        item.put("index", index++);
-                                        item.put("value", str);
-                                        strings.put(item);
                                     }
                                 }
                             }
@@ -1337,6 +1357,14 @@ public class DexManager {
                 }
             }
             
+            // 转换为数组
+            for (String str : uniqueStrings) {
+                JSObject item = new JSObject();
+                item.put("index", index++);
+                item.put("value", str);
+                strings.put(item);
+            }
+            
             result.put("strings", strings);
             result.put("count", strings.length());
             

package/package.json

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