From 08a82d8c5c1e882b09075842e216d3ac2ea01b17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20M=C3=A9a?= Date: Mon, 16 Jun 2025 20:55:01 -0400 Subject: [PATCH 1/4] Proguard rule for Pangle SDK --- app-android/proguard-rules.pro | 4 ++++ 1 file changed, 4 insertions(+) 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 From f2d7513b5e16f58af18e434a67b59abccb6a4bbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20M=C3=A9a?= Date: Mon, 16 Jun 2025 21:09:55 -0400 Subject: [PATCH 2/4] Add EU-US consent + common submodule --- .../main/java/org/mtransit/android/ad/AdsConsentManager.kt | 3 ++- .../src/main/java/org/mtransit/android/ad/GlobalAdManager.kt | 4 ++++ commons | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) 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 4f6caf040..f3da7046f 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..cf4c688e6 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,8 @@ package org.mtransit.android.ad import androidx.annotation.AnyThread import androidx.annotation.WorkerThread +import com.bytedance.sdk.openadsdk.api.PAGConstant as PanglePAGConstant +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 @@ -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 diff --git a/commons b/commons index 0ccffbb1d..6846efefa 160000 --- a/commons +++ b/commons @@ -1 +1 @@ -Subproject commit 0ccffbb1df45426c6acbd58fc7e42f5e8cb29148 +Subproject commit 6846efefa186ce824d158da9f9e4899168bf1ef7 From 7552943471583ead21b4c69924c24e398d758716 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20M=C3=A9a?= Date: Mon, 16 Jun 2025 21:16:39 -0400 Subject: [PATCH 3/4] Sync code --- commons | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commons b/commons index 6846efefa..29396da05 160000 --- a/commons +++ b/commons @@ -1 +1 @@ -Subproject commit 6846efefa186ce824d158da9f9e4899168bf1ef7 +Subproject commit 29396da055ab7dbc957a24636b42e1433e0a3097 From 2a36a43a29309239047f4ff46041c03e6edf1517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20M=C3=A9a?= Date: Mon, 16 Jun 2025 21:18:21 -0400 Subject: [PATCH 4/4] cleanup --- .../src/main/java/org/mtransit/android/ad/GlobalAdManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 cf4c688e6..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,7 +2,6 @@ package org.mtransit.android.ad import androidx.annotation.AnyThread import androidx.annotation.WorkerThread -import com.bytedance.sdk.openadsdk.api.PAGConstant as PanglePAGConstant import com.google.ads.mediation.pangle.PangleMediationAdapter import com.google.android.gms.ads.AdRequest import com.google.android.gms.ads.MobileAds @@ -22,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