Fix loading of user addons

emanuele-f · Feb 10, 2024 · 74e2b3e · 74e2b3e
1 parent ee1509e
commit 74e2b3e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/src/main/java/com/pcapdroid/mitm/MitmService.java b/app/src/main/java/com/pcapdroid/mitm/MitmService.java
@@ -172,7 +172,7 @@ public void run() {
         // Transparent mode is used with root mode where we capture the internet interface, so we must dump the server connection
         boolean dump_client = !mConf.transparentMode;
 
-        AddonsActivity.copyAddonsToPrivDir(this, m_home);
+        AddonsActivity.copyAddonsToPrivDir(this, m_home + "/mitmproxy-addons");
         String[] enabled_addons = AddonsActivity.getEnabledAddons(this).toArray(new String[]{});
 
         try {

diff --git a/app/src/main/python/mitm.py b/app/src/main/python/mitm.py
@@ -92,7 +92,7 @@ def load_addon(modname, addons):
             for addon in m.addons:
                 addons.add(addon)
     except Exception:
-        sys.stderr.write("Failed to load addon " + modname)
+        sys.stderr.write("Failed to load addon \"" + modname + "\"")
         sys.stderr.write(traceback.format_exc())
 
 def jarray_to_set(arr):
@@ -138,7 +138,7 @@ async def main():
                             fname = f[:-3]
 
                             if fname in enabled_addons:
-                                print("Loading addon: " + f)
+                                print("Loading user addon: " + f)
                                 load_addon(fname, master.addons)
 
                 print("mitmdump " + mitm_args)