X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Factivities%2FGuideActivity.java;h=856aa5d57163802fdd4c92e6d1dea72e787e48ff;hp=68be2b5eac4eab916ff14dc09e754a58ad955370;hb=0a5d2eabceeafb49a957598538aa74d4f11dfce0;hpb=49655ec36b1119810105b04a81e7ef38933213f0

diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java
index 68be2b5e..856aa5d5 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2018 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
@@ -28,6 +28,7 @@ import android.support.v4.view.ViewPager;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
+import android.view.WindowManager;
 
 import com.stoutner.privacybrowser.fragments.GuideTabFragment;
 import com.stoutner.privacybrowser.R;
@@ -35,6 +36,11 @@ import com.stoutner.privacybrowser.R;
 public class GuideActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        // Disable screenshots if not allowed.
+        if (!MainWebViewActivity.allowScreenshots) {
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+        }
+
         // Set the theme.
         if (MainWebViewActivity.darkTheme) {
             setTheme(R.style.PrivacyBrowserDark_SecondaryActivity);
@@ -49,7 +55,7 @@ public class GuideActivity extends AppCompatActivity {
         setContentView(R.layout.guide_coordinatorlayout);
 
         // We need to use `SupportActionBar` from `android.support.v7.app.ActionBar` until the minimum API is >= 21.
-        Toolbar guideAppBar = (Toolbar) findViewById(R.id.guide_toolbar);
+        Toolbar guideAppBar = findViewById(R.id.guide_toolbar);
         setSupportActionBar(guideAppBar);
 
         // Display the home arrow on `ppBar`.
@@ -58,12 +64,12 @@ public class GuideActivity extends AppCompatActivity {
         appBar.setDisplayHomeAsUpEnabled(true);
 
         //  Setup the ViewPager.
-        ViewPager aboutViewPager = (ViewPager) findViewById(R.id.guide_viewpager);
+        ViewPager aboutViewPager = findViewById(R.id.guide_viewpager);
         assert aboutViewPager != null; // This assert removes the incorrect warning in Android Studio on the following line that aboutViewPager might be null.
         aboutViewPager.setAdapter(new guidePagerAdapter(getSupportFragmentManager()));
 
         // Setup the TabLayout and connect it to the ViewPager.
-        TabLayout aboutTabLayout = (TabLayout) findViewById(R.id.guide_tablayout);
+        TabLayout aboutTabLayout = findViewById(R.id.guide_tablayout);
         assert aboutTabLayout != null; // This assert removes the incorrect warning in Android Studio on the following line that aboutTabLayout might be null.
         aboutTabLayout.setupWithViewPager(aboutViewPager);
     }
@@ -76,7 +82,7 @@ public class GuideActivity extends AppCompatActivity {
         @Override
         // Get the count of the number of tabs.
         public int getCount() {
-            return 8;
+            return 9;
         }
 
         @Override
@@ -99,7 +105,7 @@ public class GuideActivity extends AppCompatActivity {
                     return getString(R.string.domain_settings);
 
                 case 5:
-                    return getString(R.string.ssl_certificate_pinning);
+                    return getString(R.string.ssl_certificates);
 
                 case 6:
                     return getString(R.string.tor);
@@ -107,6 +113,9 @@ public class GuideActivity extends AppCompatActivity {
                 case 7:
                     return getString(R.string.tracking_ids);
 
+                case 8:
+                    return getString(R.string.bookmarks);
+
                 default:
                     return "";
             }
@@ -118,5 +127,4 @@ public class GuideActivity extends AppCompatActivity {
             return GuideTabFragment.createTab(tab);
         }
     }
-
 }