-
Notifications
You must be signed in to change notification settings - Fork 73
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
6 changed files
with
146 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,8 @@ | ||
| # Changes | ||
|
|
||
| ## 1.7.3 | ||
| * GDPR compliance | ||
|
|
||
| ## 1.7.2 | ||
| * bug fixes | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
126 changes: 126 additions & 0 deletions
126
SMSdroid/src/main/java/de/ub0r/android/smsdroid/ConsentManager.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,126 @@ | ||
| package de.ub0r.android.smsdroid; | ||
|
|
||
| import android.app.Activity; | ||
| import android.content.Intent; | ||
|
|
||
| import com.google.ads.consent.ConsentForm; | ||
| import com.google.ads.consent.ConsentFormListener; | ||
| import com.google.ads.consent.ConsentInfoUpdateListener; | ||
| import com.google.ads.consent.ConsentInformation; | ||
| import com.google.ads.consent.ConsentStatus; | ||
|
|
||
| import java.net.MalformedURLException; | ||
| import java.net.URL; | ||
| import java.util.Calendar; | ||
|
|
||
| import de.ub0r.android.lib.DonationHelper; | ||
| import de.ub0r.android.logg0r.Log; | ||
|
|
||
| public class ConsentManager { | ||
|
|
||
| private static final String TAG = "ConsentManager"; | ||
| private static final String ADMOB_PUBLISHER_ID = "pub-1948477123608376"; | ||
| private static final String PRIVACY_URL = "https://github.com/felixb/smsdroid/blob/master/PRIVACY.md"; | ||
|
|
||
| private final Activity mActivity; | ||
| private ConsentForm mForm; | ||
|
|
||
| public ConsentManager(final Activity activity) { | ||
| mActivity = activity; | ||
|
|
||
| } | ||
|
|
||
| public void updateConsent() { | ||
| if (!DonationHelper.hideAds(mActivity)) { | ||
| ConsentInformation consentInformation = ConsentInformation.getInstance(mActivity); | ||
| String[] publisherIds = {ADMOB_PUBLISHER_ID}; | ||
| consentInformation.requestConsentInfoUpdate(publisherIds, new ConsentInfoUpdateListener() { | ||
| @Override | ||
| public void onConsentInfoUpdated(final ConsentStatus consentStatus) { | ||
| Log.i(TAG, "updated consent status: ", consentStatus.toString()); | ||
| checkConsentForAds(); | ||
| } | ||
|
|
||
| @Override | ||
| public void onFailedToUpdateConsentInfo(final String errorDescription) { | ||
| Log.e(TAG, "failed to update consent info: ", errorDescription); | ||
| } | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| public boolean showAds() { | ||
| return !DonationHelper.hideAds(mActivity) && checkConsentForAds(); | ||
| } | ||
|
|
||
| private boolean checkConsentForAds() { | ||
| final ConsentInformation consentInformation = ConsentInformation.getInstance(mActivity); | ||
| if (!consentInformation.isRequestLocationInEeaOrUnknown()) { | ||
| // user is outside EEA | ||
| Log.d(TAG, "User is outseide EEA"); | ||
| return true; | ||
| } | ||
|
|
||
| final Calendar now = Calendar.getInstance(); | ||
| final Calendar gdprDeadline = Calendar.getInstance(); | ||
| gdprDeadline.set(2018, 5, 25, 0, 0, 0); | ||
|
|
||
| if (now.before(gdprDeadline)) { | ||
| Log.d(TAG, "Before GDPR deadline"); | ||
| return true; | ||
| } | ||
|
|
||
| if (ConsentStatus.UNKNOWN.equals(consentInformation.getConsentStatus())) { | ||
| Log.d(TAG, "Need to ask for consent"); | ||
| // we need to ask for consent | ||
| askForConsent(); | ||
| return false; | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| private void askForConsent() { | ||
| URL privacyUrl = null; | ||
| try { | ||
| privacyUrl = new URL(PRIVACY_URL); | ||
| } catch (MalformedURLException e) { | ||
| Log.e(TAG, "Error parsing privacy url", e); | ||
| mActivity.finish(); | ||
| } | ||
| mForm = new ConsentForm.Builder(mActivity, privacyUrl) | ||
| .withListener(new ConsentFormListener() { | ||
| @Override | ||
| public void onConsentFormLoaded() { | ||
| Log.d(TAG, "onConsentFormLoaded"); | ||
| mForm.show(); | ||
| } | ||
|
|
||
| @Override | ||
| public void onConsentFormOpened() { | ||
| Log.d(TAG, "onConsentFormOpened"); | ||
| } | ||
|
|
||
| @Override | ||
| public void onConsentFormClosed(final ConsentStatus consentStatus, final Boolean userPrefersAdFree) { | ||
| Log.d(TAG, "onConsentFormClosed(", consentStatus, userPrefersAdFree, ")"); | ||
| if (userPrefersAdFree) { | ||
| Intent i = new Intent(Intent.ACTION_VIEW, DonationHelper.DONATOR_URI); | ||
| mActivity.startActivity(i); | ||
| } else if (ConsentStatus.UNKNOWN.equals(consentStatus)) { | ||
| mActivity.finish(); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void onConsentFormError(final String errorDescription) { | ||
| Log.e(TAG, "error showing consent form: ", errorDescription); | ||
| } | ||
| }) | ||
| .withPersonalizedAdsOption() | ||
| .withAdFreeOption() | ||
| .build(); | ||
| mForm.load(); | ||
| mForm.show(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters