From c977bf047d3e64c3f39ce7656a1694f5dd6dbe38 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Mon, 3 Jul 2017 10:08:36 +0100
Subject: [PATCH] Removed overrides of showScreenFilterWarning.
---
.../briarproject/briar/android/StartupFailureActivity.java | 5 -----
.../briarproject/briar/android/activity/BaseActivity.java | 2 +-
.../briar/android/splash/SplashScreenActivity.java | 5 -----
3 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/StartupFailureActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/StartupFailureActivity.java
index 6a1292da63..51ee125d53 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/StartupFailureActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/StartupFailureActivity.java
@@ -26,11 +26,6 @@ public class StartupFailureActivity extends BaseActivity {
}
- @Override
- protected void showScreenFilterWarning() {
- // Don't show here, service might not be available
- }
-
private void handleIntent(Intent i) {
StartResult result = (StartResult) i.getSerializableExtra("briar.START_RESULT");
int notificationId = i.getIntExtra("briar.FAILURE_NOTIFICATION_ID", -1);
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 bae3e7b378..e11a5bb379 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
@@ -113,7 +113,7 @@ public abstract class BaseActivity extends AppCompatActivity
}
}
- protected void showScreenFilterWarning() {
+ private void showScreenFilterWarning() {
if (dialogFrag != null && dialogFrag.isVisible()) return;
Set<String> apps = screenFilterMonitor.getApps();
if (apps.isEmpty()) return;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java
index 7d298ef1d6..885ba7f47c 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java
@@ -83,11 +83,6 @@ public class SplashScreenActivity extends BaseActivity {
}
}
- @Override
- protected void showScreenFilterWarning() {
- // Ignore touches until the next activity is shown
- }
-
private void enableStrictMode() {
if (TESTING) {
ThreadPolicy.Builder threadPolicy = new ThreadPolicy.Builder();
--
GitLab