From cdc632e1af920cfc08931fa5fe2eaa569defb543 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Fri, 19 Mar 2021 14:28:37 -0300 Subject: [PATCH] Don't show screen filter and expiry warnings in screenshot tests --- .../org/briarproject/briar/android/activity/BaseActivity.java | 2 ++ .../briar/android/navdrawer/NavDrawerActivity.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java index 4f7b0fbde..14a6b9845 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java @@ -44,6 +44,7 @@ import static androidx.lifecycle.Lifecycle.State.STARTED; import static java.util.Collections.emptyList; import static java.util.logging.Level.INFO; import static java.util.logging.Logger.getLogger; +import static org.briarproject.briar.BuildConfig.FLAVOR; import static org.briarproject.briar.android.TestingConstants.PREVENT_SCREENSHOTS; import static org.briarproject.briar.android.util.UiUtils.hideSoftKeyboard; @@ -193,6 +194,7 @@ public abstract class BaseActivity extends AppCompatActivity } private boolean showScreenFilterWarning() { + if (FLAVOR == "screenshot") return false; // If the dialog is already visible, filter the tap ScreenFilterDialogFragment f = findDialogFragment(); if (f != null && f.isVisible()) return false; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java index c16fcd4e1..aa27b6234 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java @@ -71,6 +71,7 @@ import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleS import static org.briarproject.bramble.api.plugin.Plugin.State.ACTIVE; import static org.briarproject.bramble.api.plugin.Plugin.State.ENABLING; import static org.briarproject.bramble.api.plugin.Plugin.State.STARTING_STOPPING; +import static org.briarproject.briar.BuildConfig.FLAVOR; import static org.briarproject.briar.android.BriarService.EXTRA_STARTUP_FAILED; import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD; import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_PASSWORD; @@ -134,7 +135,7 @@ public class NavDrawerActivity extends BriarActivity implements navDrawerViewModel = provider.get(NavDrawerViewModel.class); pluginViewModel = provider.get(PluginViewModel.class); - if (IS_DEBUG_BUILD) { + if (IS_DEBUG_BUILD && (FLAVOR != "screenshot")) { navDrawerViewModel.showExpiryWarning() .observe(this, this::showExpiryWarning); }