X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Factivities%2FSettingsActivity.java;h=b306cc1225411b055a2a93c8e38d55e843a6fedd;hp=e1592a6356b66bdb201d3e12e663117a6c40d626;hb=74655c0cd0ba72c80ac6c48df55bc3d2f5280ad2;hpb=a2a4b36a691762bac757ec32f2a19264f89382e0 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..b306cc12 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-2020 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -19,9 +19,12 @@ package com.stoutner.privacybrowser.activities; +import android.content.SharedPreferences; import android.os.Bundle; -import android.preference.PreferenceFragment; -import android.support.v7.app.AppCompatActivity; +import android.preference.PreferenceManager; +import android.view.WindowManager; + +import androidx.appcompat.app.AppCompatActivity; import com.stoutner.privacybrowser.R; import com.stoutner.privacybrowser.fragments.SettingsFragment; @@ -29,18 +32,24 @@ import com.stoutner.privacybrowser.fragments.SettingsFragment; public class SettingsActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { - // Set the activity theme. - if (MainWebViewActivity.darkTheme) { - setTheme(R.style.PrivacyBrowserSettingsDark); - } else { - setTheme(R.style.PrivacyBrowserSettingsLight); + // Get a handle for the shared preferences. + SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); + + // Get the screenshot and theme preferences. + boolean allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false); + + // Disable screenshots if not allowed. + if (!allowScreenshots) { + getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE); } + // Set the theme. + setTheme(R.style.PrivacyBrowserSettings); + // 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. + getSupportFragmentManager().beginTransaction().replace(android.R.id.content, new SettingsFragment()).commit(); } -} +} \ No newline at end of file