/**
* 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
import android.widget.ProgressBar;
import android.widget.Toast;
-import com.google.android.gms.ads.AdRequest;
-import com.google.android.gms.ads.AdView;
-
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.net.URL;
// We need to use the SupportActionBar from android.support.v7.app.ActionBar until the minimum API is >= 21.
final ActionBar appBar = getSupportActionBar();
- // Setup the AdView for the free flavor.
- final AdView adView = (AdView) findViewById(R.id.adView);
+ // 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);
// Hide the mainWebView.
mainWebView.setVisibility(View.GONE);
- // Hide the add if this is the free flavor.
- if (getString(R.string.free_flavor).equals("true")) {
- adView.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.
// Show the mainWebView.
mainWebView.setVisibility(View.VISIBLE);
- // Show the adView if this is the free flavor.
- if (getString(R.string.free_flavor).equals("true")) {
- adView.setVisibility(View.VISIBLE);
- }
+ // Show the ad if this is the free flavor.
+ BannerAd.showAd(adView);
// Hide the fullScreenVideoFrameLayout.
fullScreenVideoFrameLayout.removeAllViews();
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.
mainWebView.loadUrl(formattedUrlString);
// Load the ad if this is the free flavor.
- if (getString(R.string.free_flavor).equals("true")) {
- AdRequest adRequest = new AdRequest.Builder().build();
- adView.loadAd(adRequest);
- }
+ BannerAd.requestAd(adView);
}
@Override
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:
}
}
- 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;