summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-06-04 23:45:45 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-06-05 15:06:02 +0000
commit64983abc0ff4bbbbc0c9dc0f6a25f7a09ab9d142 (patch)
tree067a550c3c11be0e4ce030558e24289be22ed705 /android
parent4b358d5341851a4c0f3b8003e2e64ff03d30a451 (diff)
downloadmullvadvpn-64983abc0ff4bbbbc0c9dc0f6a25f7a09ab9d142.tar.xz
mullvadvpn-64983abc0ff4bbbbc0c9dc0f6a25f7a09ab9d142.zip
Allow screenshots to be taken in debug builds
Diffstat (limited to 'android')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt8
1 files changed, 6 insertions, 2 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
index 0ec9581fc4..c946b47e83 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
@@ -13,6 +13,7 @@ import android.view.WindowManager
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
+import net.mullvad.mullvadvpn.BuildConfig
import net.mullvad.mullvadvpn.R
import net.mullvad.mullvadvpn.dataproxy.MullvadProblemReport
import net.mullvad.mullvadvpn.service.MullvadVpnService
@@ -111,7 +112,10 @@ class MainActivity : FragmentActivity() {
fun enterSecureScreen(screen: Fragment) {
synchronized(this) {
visibleSecureScreens.add(screen)
- window?.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
+
+ if (!BuildConfig.DEBUG) {
+ window?.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
+ }
}
}
@@ -119,7 +123,7 @@ class MainActivity : FragmentActivity() {
synchronized(this) {
visibleSecureScreens.remove(screen)
- if (visibleSecureScreens.isEmpty()) {
+ if (!BuildConfig.DEBUG && visibleSecureScreens.isEmpty()) {
window?.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
}
}