diff --git a/briar-android/src/org/briarproject/android/BriarActivity.java b/briar-android/src/org/briarproject/android/BriarActivity.java index 1d3e30b45af8aca24fa81ea9fdabd257da2f303a..6dcf3e1b7211e9d6dda1997e31275908974048e0 100644 --- a/briar-android/src/org/briarproject/android/BriarActivity.java +++ b/briar-android/src/org/briarproject/android/BriarActivity.java @@ -2,6 +2,7 @@ package org.briarproject.android; import static android.content.Intent.FLAG_ACTIVITY_NO_ANIMATION; import static android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP; +import static android.view.WindowManager.LayoutParams.FLAG_SECURE; import static android.view.inputmethod.InputMethodManager.HIDE_IMPLICIT_ONLY; import java.util.concurrent.Executor; @@ -41,6 +42,7 @@ public class BriarActivity extends RoboActivity { @Override public void onCreate(Bundle state) { super.onCreate(state); + getWindow().setFlags(FLAG_SECURE, FLAG_SECURE); if(databaseConfig.getEncryptionKey() != null) startAndBindService(); } diff --git a/briar-android/src/org/briarproject/android/ExpiredActivity.java b/briar-android/src/org/briarproject/android/ExpiredActivity.java index 453775393d29f122177c007c2a0c31e8065862b6..042d894b27234b0efbc177bf24c15f89bb857330 100644 --- a/briar-android/src/org/briarproject/android/ExpiredActivity.java +++ b/briar-android/src/org/briarproject/android/ExpiredActivity.java @@ -1,6 +1,7 @@ package org.briarproject.android; import static android.view.Gravity.CENTER; +import static android.view.WindowManager.LayoutParams.FLAG_SECURE; import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH; import org.briarproject.R; @@ -17,6 +18,8 @@ public class ExpiredActivity extends Activity { public void onCreate(Bundle state) { super.onCreate(state); + getWindow().setFlags(FLAG_SECURE, FLAG_SECURE); + LinearLayout layout = new LinearLayout(this); layout.setLayoutParams(MATCH_MATCH); layout.setGravity(CENTER); diff --git a/briar-android/src/org/briarproject/android/PasswordActivity.java b/briar-android/src/org/briarproject/android/PasswordActivity.java index 2ae108330b1ebe148dfb69cf25a046d4934948d9..68fce1d5477bd3991899abfe15a697cbc009dd18 100644 --- a/briar-android/src/org/briarproject/android/PasswordActivity.java +++ b/briar-android/src/org/briarproject/android/PasswordActivity.java @@ -6,6 +6,7 @@ import static android.view.Gravity.CENTER; import static android.view.Gravity.CENTER_HORIZONTAL; import static android.view.View.GONE; import static android.view.View.VISIBLE; +import static android.view.WindowManager.LayoutParams.FLAG_SECURE; import static android.view.inputmethod.InputMethodManager.HIDE_IMPLICIT_ONLY; import static android.widget.LinearLayout.VERTICAL; import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH; @@ -55,6 +56,8 @@ public class PasswordActivity extends RoboActivity { public void onCreate(Bundle state) { super.onCreate(state); + getWindow().setFlags(FLAG_SECURE, FLAG_SECURE); + SharedPreferences prefs = getSharedPreferences("db", MODE_PRIVATE); String hex = prefs.getString("key", null); if(hex == null || !databaseConfig.databaseExists()) { diff --git a/briar-android/src/org/briarproject/android/SetupActivity.java b/briar-android/src/org/briarproject/android/SetupActivity.java index 02d9b0183f395dbd67a2e3e87dafd06166e23e5e..69ab300a00e9c4318134960ff19136b916f0fe23 100644 --- a/briar-android/src/org/briarproject/android/SetupActivity.java +++ b/briar-android/src/org/briarproject/android/SetupActivity.java @@ -9,6 +9,7 @@ import static android.view.Gravity.CENTER_HORIZONTAL; import static android.view.View.GONE; import static android.view.View.INVISIBLE; import static android.view.View.VISIBLE; +import static android.view.WindowManager.LayoutParams.FLAG_SECURE; import static android.widget.LinearLayout.VERTICAL; import static java.util.logging.Level.INFO; import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH; @@ -74,6 +75,8 @@ public class SetupActivity extends RoboActivity implements OnClickListener { public void onCreate(Bundle state) { super.onCreate(state); + getWindow().setFlags(FLAG_SECURE, FLAG_SECURE); + LinearLayout layout = new LinearLayout(this); layout.setLayoutParams(MATCH_MATCH); layout.setOrientation(VERTICAL); diff --git a/briar-android/src/org/briarproject/android/SplashScreenActivity.java b/briar-android/src/org/briarproject/android/SplashScreenActivity.java index 16039e96ad0dab33e1218bcd78bada75cd3fd41d..fb5eeda3b54479d6806ea42235fb5b54b509e141 100644 --- a/briar-android/src/org/briarproject/android/SplashScreenActivity.java +++ b/briar-android/src/org/briarproject/android/SplashScreenActivity.java @@ -1,6 +1,7 @@ package org.briarproject.android; import static android.view.Gravity.CENTER; +import static android.view.WindowManager.LayoutParams.FLAG_SECURE; import static java.util.logging.Level.INFO; import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH; @@ -44,6 +45,8 @@ public class SplashScreenActivity extends RoboSplashActivity { public void onCreate(Bundle state) { super.onCreate(state); + getWindow().setFlags(FLAG_SECURE, FLAG_SECURE); + LinearLayout layout = new LinearLayout(this); layout.setLayoutParams(MATCH_MATCH); layout.setGravity(CENTER);