CodeCow/PCAPdroid
1
0
Fork 0
mirror of https://github.com/emanuele-f/PCAPdroid.git synced 2026-07-03 21:21:12 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix possible crashes in MitmAddon

Browse Source
This commit is contained in:
emanuele-f 2023-04-23 19:03:08 +02:00
parent 6a42e7d988
commit 5406475bed
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/com/emanuelef/remote_capture/MitmAddon.java
View File

@ -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]);