From b1ea123c594a80cf15ce1bd8517a3b7255cd47ef Mon Sep 17 00:00:00 2001
From: Hee Tatt Ooi <hee.tatt.ooi@sap.com>
Date: Thu, 11 Jun 2020 17:05:33 +0200
Subject: [PATCH] conditional screenshot prevention (#391)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
---
.../rki/coronawarnapp/CoronaWarnApplication.kt | 17 ++++++++++-------
.../ui/settings/SettingsResetFragment.kt | 1 -
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt
index 2dddb1527..3d2291df2 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt
@@ -7,6 +7,7 @@ import android.content.Context
import android.content.IntentFilter
import android.content.pm.ActivityInfo
import android.os.Bundle
+import android.view.WindowManager
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleObserver
import androidx.lifecycle.OnLifecycleEvent
@@ -94,13 +95,15 @@ class CoronaWarnApplication : Application(), LifecycleObserver,
@SuppressLint("SourceLockedOrientationActivity")
override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
- // prevents screenshot of the app for all activities
- // TODO temporarily removed screenshot prevention for testing purposes
- /*
- activity.window.setFlags(
- WindowManager.LayoutParams.FLAG_SECURE,
- WindowManager.LayoutParams.FLAG_SECURE
- )*/
+ // prevents screenshot of the app for all activities,
+ // except for deviceForTesters build flavor, which is used for testing
+ if (BuildConfig.FLAVOR != "deviceForTesters") {
+ activity.window.setFlags(
+ WindowManager.LayoutParams.FLAG_SECURE,
+ WindowManager.LayoutParams.FLAG_SECURE
+ )
+ }
+
// set screen orientation to portrait
activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsResetFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsResetFragment.kt
index 88c3d33e8..cb9ddd031 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsResetFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsResetFragment.kt
@@ -60,7 +60,6 @@ class SettingsResetFragment : Fragment() {
}
}
- // TODO verify that all local data is deleted
private fun deleteAllAppContent() {
lifecycleScope.launch {
try {
--
GitLab