From 5406475bedfb6b50047fb7b5c9bfeaa1f974e58d Mon Sep 17 00:00:00 2001
From: emanuele-f <black.silver@hotmail.it>
Date: Sun, 23 Apr 2023 19:03:08 +0200
Subject: [PATCH] Fix possible crashes in MitmAddon

---
 .../com/emanuelef/remote_capture/MitmAddon.java   | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/emanuelef/remote_capture/MitmAddon.java b/app/src/main/java/com/emanuelef/remote_capture/MitmAddon.java
index 5c882753..08038f82 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/MitmAddon.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/MitmAddon.java
@@ -201,7 +201,12 @@ public class MitmAddon {
         intent.setComponent(new ComponentName(MitmAPI.PACKAGE_NAME, MitmAPI.MITM_SERVICE));
 
         if(!mContext.bindService(intent, mConnection, Context.BIND_AUTO_CREATE | extra_flags)) {
-            mContext.unbindService(mConnection);
+            try {
+                mContext.unbindService(mConnection);
+            } catch (IllegalArgumentException ignored) {
+                Log.w(TAG, "unbindService failed");
+            }
+            mService = null;
             return false;
         }
         return true;
@@ -211,7 +216,11 @@ public class MitmAddon {
     public void disconnect() {
         if(mService != null) {
             Log.i(TAG, "Unbinding service...");
-            mContext.unbindService(mConnection);
+            try {
+                mContext.unbindService(mConnection);
+            } catch (IllegalArgumentException ignored) {
+                Log.w(TAG, "unbindService failed");
+            }
             mService = null;
         }
     }
@@ -262,7 +271,7 @@ public class MitmAddon {
 
         try {
             mService.send(msg);
-        } catch (RemoteException e) {
+        } catch (RemoteException | NullPointerException e) {
             e.printStackTrace();
             Utils.safeClose(pair[0]);
             Utils.safeClose(pair[1]);