capacitor-dex-editor 0.0.8 → 0.0.10

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

@@ -1306,21 +1306,65 @@ public class DexManager {
             // 解析 DEX 文件
             DexBackedDexFile dexFile = new DexBackedDexFile(Opcodes.getDefault(), dexBytes);
             
-            // 直接从 DEX 字符串表中读取所有字符串
-            int stringCount = dexFile.getStringCount();
-            for (int i = 0; i < stringCount; i++) {
-                try {
-                    String str = dexFile.getStringSection().get(i);
-                    JSObject item = new JSObject();
-                    item.put("index", i);
-                    item.put("value", str != null ? str : "");
-                    strings.put(item);
-                } catch (Exception e) {
-                    // 跳过无法读取的字符串
-                    Log.w(TAG, "Failed to read string at index " + i, e);
+            // 从类和方法中提取所有字符串引用
+            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()) {
+                            // 检查是否是字符串引用指令
+                            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);
+                                    }
+                                }
+                            }
+                        }
+                    }
                 }
             }
             
+            // 转换为数组
+            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());
             
@@ -1343,6 +1387,8 @@ public class DexManager {
         JSObject result = new JSObject();
         JSArray results = new JSArray();
         
+        Log.d(TAG, "searchInDexFromApk: apkPath=" + apkPath + ", dexPath=" + dexPath + ", query=" + query);
+        
         if (query == null || query.isEmpty()) {
             result.put("results", results);
             result.put("count", 0);
@@ -1356,12 +1402,29 @@ public class DexManager {
         
         try {
             zipFile = new java.util.zip.ZipFile(apkPath);
+            
+            // 尝试多种可能的 dexPath 格式
             java.util.zip.ZipEntry dexEntry = zipFile.getEntry(dexPath);
+            if (dexEntry == null && !dexPath.startsWith("/")) {
+                // 如果没有找到，尝试去掉开头的斜杠
+                dexEntry = zipFile.getEntry(dexPath.replaceFirst("^/+", ""));
+            }
+            if (dexEntry == null) {
+                // 如果还是没找到，尝试只用文件名
+                String fileName = dexPath;
+                if (dexPath.contains("/")) {
+                    fileName = dexPath.substring(dexPath.lastIndexOf("/") + 1);
+                }
+                dexEntry = zipFile.getEntry(fileName);
+            }
             
             if (dexEntry == null) {
+                Log.e(TAG, "DEX file not found in APK: " + dexPath);
                 throw new IOException("DEX file not found in APK: " + dexPath);
             }
             
+            Log.d(TAG, "Found DEX entry: " + dexEntry.getName());
+            
             dexInputStream = zipFile.getInputStream(dexEntry);
             
             // 读取 DEX 文件到内存

package/package.json

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