capacitor-dex-editor 0.0.18 → 0.0.20

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

@@ -44,7 +44,7 @@ public class DexEditorPluginPlugin extends Plugin {
         Log.d(TAG, "Executing action: " + action);
 
         // 在后台线程执行，避免阻塞UI
-        getActivity().runOnUiThread(() -> {
+        new Thread(() -> {
             try {
                 JSObject result = dispatchAction(action, params);
                 call.resolve(result);
@@ -55,7 +55,7 @@ public class DexEditorPluginPlugin extends Plugin {
                 error.put("error", e.getMessage());
                 call.resolve(error);
             }
-        });
+        }).start();
     }
 
     /**

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

@@ -1736,67 +1736,71 @@ public class DexManager {
             
             Log.d(TAG, "Merged DEX written to: " + mergedDexFile.getAbsolutePath());
             
-            // 2. 创建新的 APK（复制原 APK 并替换 DEX）
-            java.io.File outputApk = new java.io.File(apkPath + ".modified.apk");
+            zipFile.close();
+            
+            // 2. 直接替换 APK 中的 DEX（MT 管理器的方式）
+            // 使用 ZipOutputStream 重新写入 APK，只替换 DEX 部分
+            java.io.File apkFile = new java.io.File(apkPath);
+            java.io.File tempApkFile = new java.io.File(apkPath + ".tmp");
+            
+            Log.d(TAG, "Replacing DEX in APK...");
+            
+            java.util.zip.ZipFile originalZip = new java.util.zip.ZipFile(apkFile);
             java.util.zip.ZipOutputStream zos = new java.util.zip.ZipOutputStream(
-                new java.io.FileOutputStream(outputApk));
+                new java.io.BufferedOutputStream(new java.io.FileOutputStream(tempApkFile)));
             
-            // 复制原 APK 中的所有条目（除了要替换的 DEX）
-            java.util.Enumeration<? extends java.util.zip.ZipEntry> entries = zipFile.entries();
+            // 设置不压缩，加快速度
+            zos.setMethod(java.util.zip.ZipOutputStream.STORED);
+            
+            java.util.Enumeration<? extends java.util.zip.ZipEntry> entries = originalZip.entries();
             while (entries.hasMoreElements()) {
                 java.util.zip.ZipEntry entry = entries.nextElement();
-                if (entry.getName().equals(dexPath)) {
-                    // 跳过原 DEX，稍后添加新的
-                    continue;
-                }
-                
-                // 复制其他条目
-                java.util.zip.ZipEntry newEntry = new java.util.zip.ZipEntry(entry.getName());
-                zos.putNextEntry(newEntry);
                 
-                if (!entry.isDirectory()) {
-                    java.io.InputStream is = zipFile.getInputStream(entry);
-                    while ((len = is.read(buffer)) != -1) {
-                        zos.write(buffer, 0, len);
+                if (entry.getName().equals(dexPath)) {
+                    // 替换 DEX 文件
+                    byte[] dexBytes = readFileBytes(mergedDexFile);
+                    java.util.zip.ZipEntry newEntry = new java.util.zip.ZipEntry(dexPath);
+                    newEntry.setMethod(java.util.zip.ZipEntry.STORED);
+                    newEntry.setSize(dexBytes.length);
+                    newEntry.setCompressedSize(dexBytes.length);
+                    newEntry.setCrc(calculateCrc32(dexBytes));
+                    zos.putNextEntry(newEntry);
+                    zos.write(dexBytes);
+                    zos.closeEntry();
+                } else {
+                    // 复制原条目（保持原压缩方式）
+                    java.util.zip.ZipEntry newEntry = new java.util.zip.ZipEntry(entry);
+                    zos.putNextEntry(newEntry);
+                    if (!entry.isDirectory()) {
+                        java.io.InputStream is = originalZip.getInputStream(entry);
+                        byte[] buf = new byte[8192];
+                        int len;
+                        while ((len = is.read(buf)) != -1) {
+                            zos.write(buf, 0, len);
+                        }
+                        is.close();
                     }
-                    is.close();
+                    zos.closeEntry();
                 }
-                zos.closeEntry();
-            }
-            
-            // 添加修改后的 DEX
-            java.util.zip.ZipEntry newDexEntry = new java.util.zip.ZipEntry(dexPath);
-            zos.putNextEntry(newDexEntry);
-            java.io.FileInputStream fis = new java.io.FileInputStream(mergedDexFile);
-            while ((len = fis.read(buffer)) != -1) {
-                zos.write(buffer, 0, len);
             }
-            fis.close();
-            zos.closeEntry();
             
             zos.close();
-            zipFile.close();
-            
-            Log.d(TAG, "Modified APK written to: " + outputApk.getAbsolutePath());
-            
-            // 3. 替换原 APK（先备份）
-            java.io.File backupApk = new java.io.File(apkPath + ".backup");
-            java.io.File originalApkFile = new java.io.File(apkPath);
-            
-            // 复制原 APK 作为备份
-            copyFile(originalApkFile, backupApk);
+            originalZip.close();
             
-            // 用修改后的 APK 替换原 APK
-            copyFile(outputApk, originalApkFile);
-            
-            // 删除临时修改的 APK
-            outputApk.delete();
+            // 用临时文件替换原文件
+            if (!apkFile.delete()) {
+                Log.e(TAG, "Failed to delete original APK");
+            }
+            if (!tempApkFile.renameTo(apkFile)) {
+                // 如果 rename 失败，尝试复制
+                copyFile(tempApkFile, apkFile);
+                tempApkFile.delete();
+            }
             
-            Log.d(TAG, "APK updated successfully. Backup at: " + backupApk.getAbsolutePath());
+            Log.d(TAG, "APK updated successfully: " + apkPath);
             
             result.put("success", true);
-            result.put("message", "Smali 保存成功！已更新 APK");
-            result.put("backupPath", backupApk.getAbsolutePath());
+            result.put("message", "Smali 保存成功！APK 已更新");
             
             // 清理临时文件
             cleanupTempDir(tempDir);
@@ -1810,6 +1814,30 @@ public class DexManager {
         return result;
     }
 
+    /**
+     * 读取文件为字节数组
+     */
+    private byte[] readFileBytes(java.io.File file) throws java.io.IOException {
+        java.io.FileInputStream fis = new java.io.FileInputStream(file);
+        java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream();
+        byte[] buffer = new byte[8192];
+        int len;
+        while ((len = fis.read(buffer)) != -1) {
+            baos.write(buffer, 0, len);
+        }
+        fis.close();
+        return baos.toByteArray();
+    }
+
+    /**
+     * 计算 CRC32
+     */
+    private long calculateCrc32(byte[] data) {
+        java.util.zip.CRC32 crc = new java.util.zip.CRC32();
+        crc.update(data);
+        return crc.getValue();
+    }
+
     /**
      * 复制文件
      */

package/package.json

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