capacitor-dex-editor 0.0.42 → 0.0.43

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

@@ -12,8 +12,11 @@ import com.getcapacitor.JSObject;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
+import com.getcapacitor.annotation.ActivityCallback;
 import com.getcapacitor.annotation.CapacitorPlugin;
 
+import androidx.activity.result.ActivityResult;
+
 import org.json.JSONObject;
 
 /**
@@ -24,10 +27,8 @@ import org.json.JSONObject;
 public class DexEditorPluginPlugin extends Plugin {
 
     private static final String TAG = "DexEditorPlugin";
-    private static final int REQUEST_SMALI_EDITOR = 1001;
     private final DexManager dexManager = new DexManager();
     private final ApkManager apkManager = new ApkManager();
-    private PluginCall pendingEditorCall;
 
     @Override
     public void load() {
@@ -583,8 +584,6 @@ public class DexEditorPluginPlugin extends Plugin {
         String className = call.getString("className", "");
         boolean readOnly = call.getBoolean("readOnly", false);
 
-        pendingEditorCall = call;
-
         Intent intent = new Intent(getContext(), SmaliEditorActivity.class);
         intent.putExtra(SmaliEditorActivity.EXTRA_CONTENT, content);
         intent.putExtra(SmaliEditorActivity.EXTRA_TITLE, title);
@@ -594,13 +593,16 @@ public class DexEditorPluginPlugin extends Plugin {
         startActivityForResult(call, intent, "handleEditorResult");
     }
 
-    @Override
-    protected void handleOnActivityResult(int requestCode, int resultCode, Intent data) {
-        super.handleOnActivityResult(requestCode, resultCode, data);
-
-        if (pendingEditorCall != null) {
-            JSObject result = new JSObject();
-            if (resultCode == Activity.RESULT_OK && data != null) {
+    @ActivityCallback
+    private void handleEditorResult(PluginCall call, ActivityResult activityResult) {
+        if (call == null) {
+            return;
+        }
+        
+        JSObject result = new JSObject();
+        if (activityResult.getResultCode() == Activity.RESULT_OK) {
+            Intent data = activityResult.getData();
+            if (data != null) {
                 result.put("success", true);
                 result.put("content", data.getStringExtra(SmaliEditorActivity.RESULT_CONTENT));
                 result.put("modified", data.getBooleanExtra(SmaliEditorActivity.RESULT_MODIFIED, false));
@@ -608,8 +610,10 @@ public class DexEditorPluginPlugin extends Plugin {
                 result.put("success", false);
                 result.put("cancelled", true);
             }
-            pendingEditorCall.resolve(result);
-            pendingEditorCall = null;
+        } else {
+            result.put("success", false);
+            result.put("cancelled", true);
         }
+        call.resolve(result);
     }
 }

package/package.json

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