Release version 1.1.

[PrivacyBrowserAndroid.git] / app / src / main / java / com / stoutner / privacybrowser / MainWebViewActivity.java

diff --git a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java
index 7f49a6cd9083047d6a09a446d76a16a67c3a4789..2919a2229d3297bc5baa13f1a19587ac6805deb6 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java
@@ -1,7 +1,7 @@
 /**
  * Copyright 2015-2016 Soren Stoutner <soren@stoutner.com>.
  *
- * This file is part of Privacy Browser.
+ * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
  * Privacy Browser is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -53,6 +53,7 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.Toast;
+
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -105,6 +106,9 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome
         // We need to use the SupportActionBar from android.support.v7.app.ActionBar until the minimum API is >= 21.
         final ActionBar appBar = getSupportActionBar();
 
+        // Setup AdView for the free flavor.
+        final View adView = findViewById(R.id.adView);
+
         // Implement swipe to refresh
         final SwipeRefreshLayout swipeToRefresh = (SwipeRefreshLayout) findViewById(R.id.swipeRefreshLayout);
         swipeToRefresh.setColorSchemeResources(R.color.blue);
@@ -211,11 +215,16 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome
                     appBar.hide();
                 }
 
+                // Show the fullScreenVideoFrameLayout.
                 fullScreenVideoFrameLayout.addView(view);
                 fullScreenVideoFrameLayout.setVisibility(View.VISIBLE);
 
+                // Hide the mainWebView.
                 mainWebView.setVisibility(View.GONE);
 
+                // Hide the ad if this is the free flavor.
+                BannerAd.hideAd(adView);
+
                 /* SYSTEM_UI_FLAG_HIDE_NAVIGATION hides the navigation bars on the bottom or right of the screen.
                 ** SYSTEM_UI_FLAG_FULLSCREEN hides the status bar across the top of the screen.
                 ** SYSTEM_UI_FLAG_IMMERSIVE_STICKY makes the navigation and status bars ghosted overlays and automatically rehides them.
@@ -243,8 +252,13 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome
                     appBar.show();
                 }
 
+                // Show the mainWebView.
                 mainWebView.setVisibility(View.VISIBLE);
 
+                // Show the ad if this is the free flavor.
+                BannerAd.showAd(adView);
+
+                // Hide the fullScreenVideoFrameLayout.
                 fullScreenVideoFrameLayout.removeAllViews();
                 fullScreenVideoFrameLayout.setVisibility(View.GONE);
             }
@@ -267,7 +281,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome
                 }
 
                 downloadManager.enqueue(requestUri);
-                Toast.makeText(mainWebViewActivity, "Download started", Toast.LENGTH_SHORT).show();
+                Toast.makeText(mainWebViewActivity, R.string.download_started, Toast.LENGTH_SHORT).show();
             }
         });
 
@@ -304,7 +318,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome
         cookieManager = CookieManager.getInstance();
         cookieManager.setAcceptCookie(cookiesEnabled);
 
-        // Set hompage initial status.
+        // Set homepage initial status.
         homepage = savedPreferences.getString("homepage", "https://www.duckduckgo.com");
 
         // Get the intent information that started the app.
@@ -323,6 +337,9 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome
 
         // Load the initial website.
         mainWebView.loadUrl(formattedUrlString);
+
+        // Load the ad if this is the free flavor.
+        BannerAd.requestAd(adView);
     }
 
     @Override
@@ -436,7 +453,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome
                         }
                     } else {
                         menuItem.setIcon(R.drawable.privacy_mode);
-                        Toast.makeText(getApplicationContext(), "Privacy Mode", Toast.LENGTH_SHORT).show();
+                        Toast.makeText(getApplicationContext(), R.string.privacy_mode, Toast.LENGTH_SHORT).show();
                     }
                 } else {
                     javaScriptEnabled = true;
@@ -457,7 +474,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome
                     // Update the toggleJavaScript icon and display a toast message if appropriate.
                     if (!javaScriptEnabled && !cookiesEnabled) {
                         toggleJavaScript.setIcon(R.drawable.privacy_mode);
-                        Toast.makeText(getApplicationContext(), "Privacy Mode", Toast.LENGTH_SHORT).show();
+                        Toast.makeText(getApplicationContext(), R.string.privacy_mode, Toast.LENGTH_SHORT).show();
                     } else {
                         if (cookiesEnabled) {
                             toggleJavaScript.setIcon(R.drawable.warning);
@@ -505,7 +522,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome
                     // Update the toggleJavaScript icon and display a toast message if appropriate.
                     if (!javaScriptEnabled && !domStorageEnabled) {
                         toggleJavaScript.setIcon(R.drawable.privacy_mode);
-                        Toast.makeText(getApplicationContext(), "Privacy Mode", Toast.LENGTH_SHORT).show();
+                        Toast.makeText(getApplicationContext(), R.string.privacy_mode, Toast.LENGTH_SHORT).show();
                     } else {
                         if (domStorageEnabled) {
                             toggleJavaScript.setIcon(R.drawable.warning);
@@ -552,12 +569,12 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome
 
             case R.id.downloads:
                 // Launch the system Download Manager.
-                Intent downloadManangerIntent = new Intent(DownloadManager.ACTION_VIEW_DOWNLOADS);
+                Intent downloadManagerIntent = new Intent(DownloadManager.ACTION_VIEW_DOWNLOADS);
 
                 // Launch as a new task so that Download Manager and Privacy Browser show as separate windows in the recent tasks list.
-                downloadManangerIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                downloadManagerIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
-                startActivity(downloadManangerIntent);
+                startActivity(downloadManagerIntent);
                 return true;
 
             case R.id.home:
@@ -656,7 +673,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome
         }
     }
 
-    public void loadUrlFromTextBox() throws UnsupportedEncodingException {
+    private void loadUrlFromTextBox() throws UnsupportedEncodingException {
         // Get the text from urlTextBox and convert it to a string.
         String unformattedUrlString = urlTextBox.getText().toString();
         URL unformattedUrl = null;