X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Ffree%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fhelpers%2FAdHelper.java;h=4d4575d5e78949f8736e56d6a9bbca25a078fc28;hp=d1638c7386582faab50cf7c40ba83ddd86e57686;hb=1650cd6eff9ef807a84263328cb73e755250e3af;hpb=e5b7e6c354e8580d705155c02d404a0e4685e9b4 diff --git a/app/src/free/java/com/stoutner/privacybrowser/helpers/AdHelper.java b/app/src/free/java/com/stoutner/privacybrowser/helpers/AdHelper.java index d1638c73..4d4575d5 100644 --- a/app/src/free/java/com/stoutner/privacybrowser/helpers/AdHelper.java +++ b/app/src/free/java/com/stoutner/privacybrowser/helpers/AdHelper.java @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2018 Soren Stoutner . + * Copyright © 2016-2020 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -19,105 +19,124 @@ package com.stoutner.privacybrowser.helpers; -import android.app.DialogFragment; -import android.app.FragmentManager; +import android.app.Activity; import android.content.Context; import android.os.Bundle; +import android.util.DisplayMetrics; +import android.view.Display; import android.view.View; import android.widget.RelativeLayout; -import com.google.ads.consent.ConsentInfoUpdateListener; -import com.google.ads.consent.ConsentInformation; -import com.google.ads.consent.ConsentStatus; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.FragmentManager; + import com.google.ads.mediation.admob.AdMobAdapter; import com.google.android.gms.ads.AdRequest; import com.google.android.gms.ads.AdSize; import com.google.android.gms.ads.AdView; import com.google.android.gms.ads.MobileAds; + import com.stoutner.privacybrowser.R; import com.stoutner.privacybrowser.dialogs.AdConsentDialog; public class AdHelper { private static boolean initialized; - public static void initializeAds (View view, Context applicationContext, FragmentManager fragmentManager, String googleAppId, String adUnitId) { + public static void initializeAds(View view, Context applicationContext, Activity activity, FragmentManager fragmentManager, String adUnitId) { if (!initialized) { // This is the first run. // Initialize mobile ads. - MobileAds.initialize(applicationContext, googleAppId); - - // Store the publisher ID in a string array. - String[] publisherIds = {"pub-5962503714887045"}; - - // Check to see if consent is needed in Europe to comply with the GDPR. - ConsentInformation consentInformation = ConsentInformation.getInstance(applicationContext); - consentInformation.requestConsentInfoUpdate(publisherIds, new ConsentInfoUpdateListener() { - @Override - public void onConsentInfoUpdated(ConsentStatus consentStatus) { - if (consentStatus == ConsentStatus.UNKNOWN) { // The user has not yet consented to ads. - // Display the ad consent dialog. - DialogFragment adConsentDialogFragment = new AdConsentDialog(); - adConsentDialogFragment.show(fragmentManager, "Ad Consent"); - } else { // The user has consented to ads. - // Indicate the user is under age, which disables personalized advertising and remarketing. https://developers.google.com/admob/android/eu-consent - consentInformation.setTagForUnderAgeOfConsent(true); - - // Load an ad. - loadAd(view, applicationContext, adUnitId); - } - } - - @Override - public void onFailedToUpdateConsentInfo(String reason) { // The user is not in Europe. - // Indicate the user is under age, which disables personalized advertising and remarketing. https://developers.google.com/admob/android/eu-consent - consentInformation.setTagForUnderAgeOfConsent(true); - - // Load an ad. - loadAd(view, applicationContext, adUnitId); - } - }); + MobileAds.initialize(applicationContext); + + // Initialize the bookmarks database helper. The `0` specifies a database version, but that is ignored and set instead using a constant in `AdConsentDatabaseHelper`. + AdConsentDatabaseHelper adConsentDatabaseHelper = new AdConsentDatabaseHelper(applicationContext, null, null, 0); + + // Check to see if consent has been granted. + boolean adConsentGranted = adConsentDatabaseHelper.isGranted(); + + // Display the ad consent dialog if needed. + if (!adConsentGranted) { // Ad consent has not been granted. + // Instantiate the ad consent dialog. + DialogFragment adConsentDialogFragment = new AdConsentDialog(); + + // Display the ad consent dialog. + adConsentDialogFragment.show(fragmentManager, "Ad Consent"); + } else { // Ad consent has been granted. + // Load an ad. + loadAd(view, applicationContext, activity, adUnitId); + } // Set the initialized variable to true so this section doesn't run again. initialized = true; } else { // Ads have previously been initialized. // Load an ad. - loadAd(view, applicationContext, adUnitId); + loadAd(view, applicationContext, activity, adUnitId); } } - public static void loadAd (View view, Context applicationContext, String adUnitId) { + public static void loadAd(View view, Context applicationContext, Activity activity, String adUnitId) { // Cast the generic view to an AdView. AdView adView = (AdView) view; - // Save the layout parameters. They are used when programatically recreating the add below. + // Save the layout parameters. They are used when programatically recreating the ad below. RelativeLayout.LayoutParams adViewLayoutParameters = (RelativeLayout.LayoutParams) adView.getLayoutParams(); - // Remove the AdView. + // Get a handle for the ad view parent. RelativeLayout adViewParentLayout = (RelativeLayout) adView.getParent(); + + // Remove the AdView. adViewParentLayout.removeView(adView); - // Setup the new AdView. This is necessary because the size of the banner ad can change on rotate. + // Create a new AdView. This is necessary because the size can change when the device is rotated. adView = new AdView(applicationContext); - adView.setAdSize(AdSize.SMART_BANNER); + + // Set the ad unit ID. adView.setAdUnitId(adUnitId); + + // Set the view ID. adView.setId(R.id.adview); + + // Set the layout parameters. adView.setLayoutParams(adViewLayoutParameters); - // Display the new AdView. + // Add the new ad view to the parent layout. adViewParentLayout.addView(adView); - // Only request non-personalized ads. + // Get a handle for the display. + Display display = activity.getWindowManager().getDefaultDisplay(); + + // Initialize a display metrics. + DisplayMetrics displayMetrics = new DisplayMetrics(); + + // Get the display metrics from the display. + display.getMetrics(displayMetrics); + + // Get the width pixels and the density. + float widthPixels = displayMetrics.widthPixels; + float density = displayMetrics.density; + + // Calculate the ad width. + int adWidth = (int) (widthPixels / density); + + // Get the ad size. This line should be enabled once Firebase Ads is updated to 20.0.0. + AdSize adSize = AdSize.getCurrentOrientationAnchoredAdaptiveBannerAdSize(applicationContext, adWidth); + + // Set the ad size on the adView. + adView.setAdSize(adSize); + + // Create an ad settings bundle. Bundle adSettingsBundle = new Bundle(); + + // Only request non-personalized ads. https://developers.google.com/ad-manager/mobile-ads-sdk/android/eu-consent#forward_consent_to_the_google_mobile_ads_sdk adSettingsBundle.putString("npa", "1"); - // Request a new ad. + // Build the ad request. AdRequest adRequest = new AdRequest.Builder().addNetworkExtrasBundle(AdMobAdapter.class, adSettingsBundle).build(); - // Pixel test ads. - // AdRequest adRequest = new AdRequest.Builder().addTestDevice("20DAEEF7662E2238C99A509BE5D78A26").addNetworkExtrasBundle(AdMobAdapter.class, adSettingsBundle).build(); - // Pixel 2 XL test ads. - // AdRequest adRequest = new AdRequest.Builder().addTestDevice("137D42984218CEECDFD11927BB7D6416").addNetworkExtrasBundle(AdMobAdapter.class, adSettingsBundle).build(); + + // Make it so. adView.loadAd(adRequest); } + // This method exists here for the sake of consistency with the following two methods. public static void hideAd(View view) { // Cast the generic view to an AdView. AdView adView = (AdView) view; @@ -126,6 +145,7 @@ public class AdHelper { adView.setVisibility(View.GONE); } + // This method exists here so that the main WebView activity doesn't need to import `com.google.android.gms.ads.AdView`. public static void pauseAd(View view) { // Cast The generic view to an AdView. AdView adView = (AdView) view; @@ -134,6 +154,7 @@ public class AdHelper { adView.pause(); } + // This method exists here so that the main WebView activity doesn't need to import `com.google.android.gms.ads.AdView`. public static void resumeAd(View view) { // Cast the generic view to an AdView. AdView adView = (AdView) view;