diff --git a/app-android/proguard-rules.pro b/app-android/proguard-rules.pro index 10b7e5eee..3507aaa16 100644 --- a/app-android/proguard-rules.pro +++ b/app-android/proguard-rules.pro @@ -125,5 +125,9 @@ } # VUNGLE - END +# PANGLE - START +-keep class com.bytedance.sdk.** { *; } +# PANGLE - END + -dontwarn android.media.LoudnessCodecController$OnLoudnessCodecUpdateListener -dontwarn android.media.LoudnessCodecController \ No newline at end of file diff --git a/app-android/src/main/java/org/mtransit/android/ad/AdsConsentManager.kt b/app-android/src/main/java/org/mtransit/android/ad/AdsConsentManager.kt index 9bef6d701..7c1fd4024 100644 --- a/app-android/src/main/java/org/mtransit/android/ad/AdsConsentManager.kt +++ b/app-android/src/main/java/org/mtransit/android/ad/AdsConsentManager.kt @@ -59,7 +59,8 @@ class AdsConsentManager @Inject constructor( } }.build() consentInformation.requestConsentInfoUpdate( - activity, consentRequestParams, + activity, + consentRequestParams, { MTLog.d(this, "Consent information successfully updated.") loadAndShowConsentFormIfRequired(activity, onConsentGatheringCompleteListener) diff --git a/app-android/src/main/java/org/mtransit/android/ad/GlobalAdManager.kt b/app-android/src/main/java/org/mtransit/android/ad/GlobalAdManager.kt index ead51f490..c6bf04b6c 100644 --- a/app-android/src/main/java/org/mtransit/android/ad/GlobalAdManager.kt +++ b/app-android/src/main/java/org/mtransit/android/ad/GlobalAdManager.kt @@ -2,6 +2,7 @@ package org.mtransit.android.ad import androidx.annotation.AnyThread import androidx.annotation.WorkerThread +import com.google.ads.mediation.pangle.PangleMediationAdapter import com.google.android.gms.ads.AdRequest import com.google.android.gms.ads.MobileAds import com.google.android.gms.ads.RequestConfiguration @@ -20,6 +21,7 @@ import org.mtransit.android.dev.DemoModeManager import java.util.concurrent.atomic.AtomicBoolean import javax.inject.Inject import javax.inject.Singleton +import com.bytedance.sdk.openadsdk.api.PAGConstant as PanglePAGConstant import com.google.android.ump.FormError as UMPFormError @Singleton @@ -116,6 +118,8 @@ class GlobalAdManager( .build() ) } + PangleMediationAdapter.setGDPRConsent(PanglePAGConstant.PAGGDPRConsentType.PAG_GDPR_CONSENT_TYPE_CONSENT) // EU user consent policy + PangleMediationAdapter.setPAConsent(PanglePAGConstant.PAGPAConsentType.PAG_PA_CONSENT_TYPE_CONSENT) // US states privacy laws // https://developers.google.com/admob/android/quick-start#initialize_the_mobile_ads_sdk MobileAds.initialize( activity.requireActivity(), // some adapters require activity