X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Factivities%2FSettingsActivity.java;h=cb4146da0c8ad243fa032bfe588f2f15f582e9ef;hb=5241a83576c30f1fbb6f3527dfb0849b1b81d876;hp=e1592a6356b66bdb201d3e12e663117a6c40d626;hpb=a2a4b36a691762bac757ec32f2a19264f89382e0;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/SettingsActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/SettingsActivity.java index e1592a63..cb4146da 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/SettingsActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/SettingsActivity.java @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2017 Soren Stoutner . + * Copyright © 2016-2018 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -20,8 +20,8 @@ package com.stoutner.privacybrowser.activities; import android.os.Bundle; -import android.preference.PreferenceFragment; import android.support.v7.app.AppCompatActivity; +import android.view.WindowManager; import com.stoutner.privacybrowser.R; import com.stoutner.privacybrowser.fragments.SettingsFragment; @@ -29,6 +29,11 @@ import com.stoutner.privacybrowser.fragments.SettingsFragment; public class SettingsActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { + // Disable screenshots if not allowed. + if (!MainWebViewActivity.allowScreenshots) { + getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE); + } + // Set the activity theme. if (MainWebViewActivity.darkTheme) { setTheme(R.style.PrivacyBrowserSettingsDark); @@ -39,8 +44,7 @@ public class SettingsActivity extends AppCompatActivity { // Run the default commands. super.onCreate(savedInstanceState); - // Display SettingsFragment. - PreferenceFragment settingsFragment = new SettingsFragment(); - getFragmentManager().beginTransaction().replace(android.R.id.content, settingsFragment).commit(); + // Display the settings fragment. + getFragmentManager().beginTransaction().replace(android.R.id.content, new SettingsFragment()).commit(); } }