capacitor-dex-editor 0.0.17 → 0.0.18

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

@@ -1679,20 +1679,127 @@ public class DexManager {
             
             Log.d(TAG, "Smali compiled successfully to: " + outputDex.getAbsolutePath());
             
-            // TODO: 将编译后的 dex 合并回原 APK
-            // 这是一个复杂的操作，需要：
-            // 1. 解压 APK
-            // 2. 替换/合并 DEX 文件中的类
-            // 3. 重新打包 APK
-            // 4. 重新签名 APK
-            
-            // 目前先返回成功，实际保存功能需要更多实现
+            // 将编译后的类合并到原 DEX 文件中
+            // 1. 读取原 APK 中的 DEX 文件
+            java.util.zip.ZipFile zipFile = new java.util.zip.ZipFile(apkPath);
+            java.util.zip.ZipEntry dexEntry = zipFile.getEntry(dexPath);
+            
+            if (dexEntry == null) {
+                result.put("success", false);
+                result.put("error", "DEX 文件未找到: " + dexPath);
+                zipFile.close();
+                cleanupTempDir(tempDir);
+                return result;
+            }
+            
+            // 读取原 DEX
+            java.io.InputStream dexInputStream = zipFile.getInputStream(dexEntry);
+            java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream();
+            byte[] buffer = new byte[8192];
+            int len;
+            while ((len = dexInputStream.read(buffer)) != -1) {
+                baos.write(buffer, 0, len);
+            }
+            byte[] originalDexBytes = baos.toByteArray();
+            dexInputStream.close();
+            
+            // 解析原 DEX 和新编译的 DEX
+            DexBackedDexFile originalDex = new DexBackedDexFile(Opcodes.getDefault(), originalDexBytes);
+            DexBackedDexFile newDex = DexBackedDexFile.fromInputStream(Opcodes.getDefault(), 
+                new java.io.BufferedInputStream(new java.io.FileInputStream(outputDex)));
+            
+            // 合并 DEX：用新类替换原类
+            String targetType = "L" + className.replace(".", "/") + ";";
+            java.util.List<ClassDef> mergedClasses = new java.util.ArrayList<>();
+            
+            // 添加原 DEX 中除目标类外的所有类
+            for (ClassDef classDef : originalDex.getClasses()) {
+                if (!classDef.getType().equals(targetType)) {
+                    mergedClasses.add(classDef);
+                }
+            }
+            
+            // 添加新编译的类
+            for (ClassDef classDef : newDex.getClasses()) {
+                mergedClasses.add(classDef);
+            }
+            
+            Log.d(TAG, "Merged " + mergedClasses.size() + " classes");
+            
+            // 创建新的 DEX 文件
+            java.io.File mergedDexFile = new java.io.File(tempDir, "classes_merged.dex");
+            DexPool dexPool = new DexPool(Opcodes.getDefault());
+            for (ClassDef classDef : mergedClasses) {
+                dexPool.internClass(classDef);
+            }
+            dexPool.writeTo(new FileDataStore(mergedDexFile));
+            
+            Log.d(TAG, "Merged DEX written to: " + mergedDexFile.getAbsolutePath());
+            
+            // 2. 创建新的 APK（复制原 APK 并替换 DEX）
+            java.io.File outputApk = new java.io.File(apkPath + ".modified.apk");
+            java.util.zip.ZipOutputStream zos = new java.util.zip.ZipOutputStream(
+                new java.io.FileOutputStream(outputApk));
+            
+            // 复制原 APK 中的所有条目（除了要替换的 DEX）
+            java.util.Enumeration<? extends java.util.zip.ZipEntry> entries = zipFile.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);
+                    }
+                    is.close();
+                }
+                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);
+            
+            // 用修改后的 APK 替换原 APK
+            copyFile(outputApk, originalApkFile);
+            
+            // 删除临时修改的 APK
+            outputApk.delete();
+            
+            Log.d(TAG, "APK updated successfully. Backup at: " + backupApk.getAbsolutePath());
+            
             result.put("success", true);
-            result.put("message", "Smali 编译成功，但完整保存功能需要进一步实现");
-            result.put("compiledDexPath", outputDex.getAbsolutePath());
+            result.put("message", "Smali 保存成功！已更新 APK");
+            result.put("backupPath", backupApk.getAbsolutePath());
             
-            // 清理临时文件（暂时保留以便调试）
-            // cleanupTempDir(tempDir);
+            // 清理临时文件
+            cleanupTempDir(tempDir);
             
         } catch (Exception e) {
             Log.e(TAG, "Error saving smali: " + e.getMessage(), e);
@@ -1703,6 +1810,21 @@ public class DexManager {
         return result;
     }
 
+    /**
+     * 复制文件
+     */
+    private void copyFile(java.io.File src, java.io.File dst) throws java.io.IOException {
+        java.io.FileInputStream fis = new java.io.FileInputStream(src);
+        java.io.FileOutputStream fos = new java.io.FileOutputStream(dst);
+        byte[] buffer = new byte[8192];
+        int len;
+        while ((len = fis.read(buffer)) != -1) {
+            fos.write(buffer, 0, len);
+        }
+        fis.close();
+        fos.close();
+    }
+
     /**
      * 清理临时目录
      */

package/package.json

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