From 0922953bcacc506512d8f51f8318766fc2d11b49 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Mon, 15 Jan 2018 11:36:25 -0200 Subject: [PATCH] Make sure FLAG_SECURE is set on all activities when activated --- app/src/main/java/org/fdroid/fdroid/FDroidApp.java | 11 ++++++++--- .../fdroid/views/swap/SwapWorkflowActivity.java | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/FDroidApp.java b/app/src/main/java/org/fdroid/fdroid/FDroidApp.java index ce4176181..e08216491 100644 --- a/app/src/main/java/org/fdroid/fdroid/FDroidApp.java +++ b/app/src/main/java/org/fdroid/fdroid/FDroidApp.java @@ -127,9 +127,7 @@ public class FDroidApp extends Application { public void applyTheme(Activity activity) { activity.setTheme(getCurThemeResId()); - if (Preferences.get().preventScreenshots()) { - activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE); - } + setSecureWindow(activity); } public static int getCurThemeResId() { @@ -147,6 +145,13 @@ public class FDroidApp extends Application { public void applyDialogTheme(Activity activity) { activity.setTheme(getCurDialogThemeResId()); + setSecureWindow(activity); + } + + public void setSecureWindow(Activity activity) { + if (Preferences.get().preventScreenshots()) { + activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE); + } } private static int getCurDialogThemeResId() { diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java index fdb476522..4bbfbd4f1 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java @@ -163,6 +163,7 @@ public class SwapWorkflowActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { + ((FDroidApp) getApplication()).setSecureWindow(this); super.onCreate(savedInstanceState); // The server should not be doing anything or occupying any (noticeable) resources