CodeCow/PCAPdroid
1
0
Fork 0
mirror of https://github.com/emanuele-f/PCAPdroid.git synced 2026-06-16 21:10:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix tests execution

Browse Source
This commit is contained in:
emanuele-f 2022-01-11 00:27:00 +01:00
parent bd2f85f876
commit e7bc6ba8d1
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ public class PCAPdroid extends Application {
CaocConfig.Builder builder = CaocConfig.Builder.create();
if((buildtp == Utils.BuildType.PLAYSTORE) || (buildtp == Utils.BuildType.UNKNOWN)) {
// Disabled to get reports via the Android system reporting facility
// Disabled to get reports via the Android system reporting facility and for unsupported builds
builder.enabled(false);
} else {
builder.errorDrawable(R.drawable.ic_app_crash)

6
app/src/main/java/com/emanuelef/remote_capture/Utils.java
View File

@ -888,6 +888,7 @@ public class Utils {
return false;
}
@SuppressWarnings("deprecation")
public static BuildType getBuildType(Context ctx) {
try {
Signature[] signatures;
@ -895,13 +896,14 @@ public class Utils {
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
// NOTE: PCAPdroid does not use multiple signatures
PackageInfo pInfo = ctx.getPackageManager().getPackageInfo(ctx.getPackageName(), PackageManager.GET_SIGNING_CERTIFICATES);
signatures = pInfo.signingInfo.getSigningCertificateHistory();
signatures = (pInfo.signingInfo == null) ? null : pInfo.signingInfo.getSigningCertificateHistory();
} else {
PackageInfo pInfo = ctx.getPackageManager().getPackageInfo(ctx.getPackageName(), PackageManager.GET_SIGNATURES);
signatures = pInfo.signatures;
}
if(signatures.length < 1)
// can be null in robolectric tests
if((signatures == null) || (signatures.length < 1))
return BuildType.UNKNOWN;
MessageDigest sha1 = MessageDigest.getInstance("SHA");