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 IllegalStateException in mitm wizard

Browse Source
This commit is contained in:
emanuele-f 2022-06-04 12:17:26 +02:00
parent aa2efb8079
commit 4a1e24b710
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/emanuelef/remote_capture/fragments/mitmwizard/InstallCertificate.java
View File

@ -163,6 +163,14 @@ public class InstallCertificate extends StepFragment implements MitmListener {
@Override
public void onMitmGetCaCertificateResult(@Nullable String ca_pem) {
mAddon.disconnect();
// NOTE: this may be called when context is null
Context context = getContext();
if(context == null) {
Log.d(TAG, "null context");
return;
}
mCaPem = ca_pem;
// NOTE: onMitmGetCaCertificateResult can be called by fallbackToCertExport
@ -178,7 +186,7 @@ public class InstallCertificate extends StepFragment implements MitmListener {
certOk();
else {
// Cert not installed
MitmAddon.setDecryptionSetupDone(requireContext(), false);
MitmAddon.setDecryptionSetupDone(context, false);
mStepIcon.setColorFilter(mWarnColor);
mStepButton.setEnabled(true);
@ -195,7 +203,7 @@ public class InstallCertificate extends StepFragment implements MitmListener {
});
}
} else {
Toast.makeText(requireContext(), "addon did not return certificate", Toast.LENGTH_LONG).show();
Toast.makeText(context, "addon did not return certificate", Toast.LENGTH_LONG).show();
certFail();
}
}

2
app/src/main/java/com/emanuelef/remote_capture/interfaces/MitmListener.java
View File

@ -22,7 +22,9 @@ package com.emanuelef.remote_capture.interfaces;
import org.jetbrains.annotations.Nullable;
public interface MitmListener {
// NOTE: for fragments, this may be called when their context is null
void onMitmGetCaCertificateResult(@Nullable String ca_pem);
void onMitmServiceConnect();
void onMitmServiceDisconnect();
}