From 5ce21a94ea70a31e6bbe1cfc6655f4ed3adcd3b4 Mon Sep 17 00:00:00 2001 From: Alexander Bakker Date: Thu, 17 Feb 2022 15:47:27 +0100 Subject: [PATCH] Only skip panic trigger signature check if running under a test --- app/build.gradle | 1 + .../java/com/beemdevelopment/aegis/AegisTestRunner.java | 4 ++++ .../com/beemdevelopment/aegis/ui/PanicResponderActivity.java | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index f9502fc8..5cf73040 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,6 +29,7 @@ android { multiDexEnabled true buildConfigField "String", "GIT_HASH", "\"${getGitHash()}\"" buildConfigField "String", "GIT_BRANCH", "\"${getGitBranch()}\"" + buildConfigField "java.util.concurrent.atomic.AtomicBoolean", "TEST", "new java.util.concurrent.atomic.AtomicBoolean(false)" testInstrumentationRunner "com.beemdevelopment.aegis.AegisTestRunner" testInstrumentationRunnerArguments clearPackageData: 'true' diff --git a/app/src/androidTest/java/com/beemdevelopment/aegis/AegisTestRunner.java b/app/src/androidTest/java/com/beemdevelopment/aegis/AegisTestRunner.java index da76f501..d82f6620 100644 --- a/app/src/androidTest/java/com/beemdevelopment/aegis/AegisTestRunner.java +++ b/app/src/androidTest/java/com/beemdevelopment/aegis/AegisTestRunner.java @@ -10,6 +10,10 @@ import androidx.test.runner.AndroidJUnitRunner; import com.beemdevelopment.aegis.util.IOUtils; public class AegisTestRunner extends AndroidJUnitRunner { + static { + BuildConfig.TEST.set(true); + } + @Override public void callApplicationOnCreate(Application app) { Context context = app.getApplicationContext(); diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/PanicResponderActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/PanicResponderActivity.java index b9cac3b7..95d5deb5 100644 --- a/app/src/main/java/com/beemdevelopment/aegis/ui/PanicResponderActivity.java +++ b/app/src/main/java/com/beemdevelopment/aegis/ui/PanicResponderActivity.java @@ -28,7 +28,7 @@ public class PanicResponderActivity extends AegisActivity { } Intent intent; - if (!BuildConfig.DEBUG) { + if (!BuildConfig.TEST.get()) { TrustedIntents trustedIntents = TrustedIntents.get(this); trustedIntents.addTrustedSigner(GuardianProjectRSA4096.class); trustedIntents.addTrustedSigner(GuardianProjectFDroidRSA2048.class);