Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Consent Mode v2 (Android & iOS) #878

Merged
merged 18 commits into from
Apr 23, 2024
Merged

Add Consent Mode v2 (Android & iOS) #878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
bfe6eeb
Added GOOGLE_ANALYTICS_ADID_COLLECTION_ENABLED, GOOGLE_ANALYTICS_DEFA…
pinguluk Feb 29, 2024
f0d7f98
Reverted helper.js
pinguluk Feb 29, 2024
154d3da
Readded changes in helper.js (without file being formated)
pinguluk Feb 29, 2024
cb0ff35
Created setAnalyticsConsentMode function
pinguluk Feb 29, 2024
01cbe49
Added this. to AutoInitEnabled & changed "execute" function from if e…
pinguluk Feb 29, 2024
66dd121
Added setAnalyticsConsentMode function only
pinguluk Feb 29, 2024
bf389ba
Added setAnalyticsConsentMode in README.md and index.d.ts
pinguluk Feb 29, 2024
d646dfd
Added setAnalyticsConsentMode to menu in README.md
pinguluk Feb 29, 2024
16b5774
Added setAnalyticsConsentMode to Disable data collection startup in R…
pinguluk Feb 29, 2024
65d4365
Added setAnalyticsConsentMode for iOS
pinguluk Mar 14, 2024
3ad7cb0
Updated Firebase pods to 10.21.1; Updated GoogleSignIn pod to 7.1.0-f…
pinguluk Mar 14, 2024
af10d7a
Downgraded Firebase version to 10.22.0
pinguluk Mar 14, 2024
318c04b
Changed FirebaseInAppMessaging version to 10.22.0-beta
pinguluk Mar 14, 2024
d3b87ea
Merge pull request #1 from pinguluk/develop
pinguluk Mar 27, 2024
2f9ecb7
Updated iOS sdk to 10.24.0; Bumped up Android sdks versions
pinguluk Apr 19, 2024
8cacc46
Merge pull request #2 from pinguluk/develop
pinguluk Apr 19, 2024
cb073ef
Downgraded GoogleSignIn to 6.2.4
pinguluk Apr 23, 2024
95b727a
Merge pull request #3 from pinguluk/develop
pinguluk Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4,669 changes: 2,730 additions & 1,939 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

58 changes: 34 additions & 24 deletions plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@
<preference name="FIREBASE_CRASHLYTICS_COLLECTION_ENABLED" default="true" />
<preference name="FIREBASE_FCM_AUTOINIT_ENABLED" default="true" />
<preference name="FIREBASE_ANALYTICS_WITHOUT_ADS" default="false" />

<preference name="GOOGLE_ANALYTICS_ADID_COLLECTION_ENABLED" default="true" />
<preference name="GOOGLE_ANALYTICS_DEFAULT_ALLOW_ANALYTICS_STORAGE" default="true" />
<preference name="GOOGLE_ANALYTICS_DEFAULT_ALLOW_AD_STORAGE" default="true" />
<preference name="GOOGLE_ANALYTICS_DEFAULT_ALLOW_AD_USER_DATA" default="true" />
<preference name="GOOGLE_ANALYTICS_DEFAULT_ALLOW_AD_PERSONALIZATION_SIGNALS" default="true" />

<platform name="android">
<preference name="ANDROID_ICON_ACCENT" default="#FF00FFFF" />
Expand Down Expand Up @@ -54,7 +60,11 @@
<meta-data android:name="firebase_performance_collection_enabled" android:value="$FIREBASE_PERFORMANCE_COLLECTION_ENABLED" />
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="$FIREBASE_CRASHLYTICS_COLLECTION_ENABLED" />
<meta-data android:name="firebase_messaging_auto_init_enabled" android:value="$FIREBASE_FCM_AUTOINIT_ENABLED" />
<meta-data android:name="google_analytics_adid_collection_enabled" android:value="true" />
<meta-data android:name="google_analytics_adid_collection_enabled" android:value="$GOOGLE_ANALYTICS_ADID_COLLECTION_ENABLED" />
<meta-data android:name="google_analytics_default_allow_analytics_storage" android:value="$GOOGLE_ANALYTICS_DEFAULT_ALLOW_ANALYTICS_STORAGE" />
<meta-data android:name="google_analytics_default_allow_ad_storage" android:value="$GOOGLE_ANALYTICS_DEFAULT_ALLOW_AD_STORAGE" />
<meta-data android:name="google_analytics_default_allow_ad_user_data" android:value="$GOOGLE_ANALYTICS_DEFAULT_ALLOW_AD_USER_DATA" />
<meta-data android:name="google_analytics_default_allow_ad_personalization_signals" android:value="$GOOGLE_ANALYTICS_DEFAULT_ALLOW_AD_PERSONALIZATION_SIGNALS" />
</config-file>
<resource-file src="src/android/cordova-plugin-firebase-strings.xml" target="res/values/cordova-plugin-firebase-strings.xml" />
<source-file src="src/android/FirebasePlugin.java" target-dir="src/org/apache/cordova/firebase" />
Expand All @@ -70,18 +80,18 @@
<!-- Default versions for Gradle dependencies -->
<preference name="ANDROID_PLAY_SERVICES_TAGMANAGER_VERSION" default="18.0.4" />
<preference name="ANDROID_PLAY_SERVICES_AUTH_VERSION" default="20.7.0" />
<preference name="ANDROID_FIREBASE_ANALYTICS_VERSION" default="21.5.0" />
<preference name="ANDROID_FIREBASE_MESSAGING_VERSION" default="23.3.1" />
<preference name="ANDROID_FIREBASE_CONFIG_VERSION" default="21.5.0" />
<preference name="ANDROID_FIREBASE_PERF_VERSION" default="20.5.0" />
<preference name="ANDROID_FIREBASE_AUTH_VERSION" default="22.2.0" />
<preference name="ANDROID_FIREBASE_INAPPMESSAGING_VERSION" default="20.4.0" />
<preference name="ANDROID_FIREBASE_FIRESTORE_VERSION" default="24.9.1" />
<preference name="ANDROID_FIREBASE_ANALYTICS_VERSION" default="21.6.2" />
<preference name="ANDROID_FIREBASE_MESSAGING_VERSION" default="23.4.1" />
<preference name="ANDROID_FIREBASE_CONFIG_VERSION" default="21.6.3" />
<preference name="ANDROID_FIREBASE_PERF_VERSION" default="20.5.2" />
<preference name="ANDROID_FIREBASE_AUTH_VERSION" default="22.3.1" />
<preference name="ANDROID_FIREBASE_INAPPMESSAGING_VERSION" default="20.4.2" />
<preference name="ANDROID_FIREBASE_FIRESTORE_VERSION" default="24.11.1" />
<preference name="ANDROID_FIREBASE_FUNCTIONS_VERSION" default="20.4.0" />
<preference name="ANDROID_FIREBASE_IID_VERSION" default="21.1.0" /> <!-- deprecated but required by firebase-messaging -->
<preference name="ANDROID_FIREBASE_INSTALLATIONS_VERSION" default="17.2.0" />
<preference name="ANDROID_FIREBASE_CRASHLYTICS_VERSION" default="18.5.1" />
<preference name="ANDROID_FIREBASE_CRASHLYTICS_NDK_VERSION" default="18.5.1" />
<preference name="ANDROID_FIREBASE_CRASHLYTICS_VERSION" default="18.6.4" />
<preference name="ANDROID_FIREBASE_CRASHLYTICS_NDK_VERSION" default="18.6.4" />
<preference name="ANDROID_GSON_VERSION" default="2.9.0" />
<preference name="ANDROID_FIREBASE_PERF_GRADLE_PLUGIN_VERSION" default="1.4.2" />
<preference name="ANDROID_GRPC_OKHTTP" default="1.46.0" />
Expand Down Expand Up @@ -156,24 +166,24 @@
<source url="https://cdn.cocoapods.org/"/>
</config>
<pods use-frameworks="true">
<pod name="FirebaseCore" spec="10.17.0"/>
<pod name="FirebaseAuth" spec="10.17.0"/>
<pod name="FirebaseAnalytics" spec="10.17.0"/>
<!--<pod name="FirebaseAnalyticsOnDeviceConversion" spec="10.17.0"/>-->
<pod name="FirebaseMessaging" spec="10.17.0"/>
<pod name="FirebasePerformance" spec="10.17.0"/>
<pod name="FirebaseRemoteConfig" spec="10.17.0"/>
<pod name="FirebaseInAppMessaging" spec="10.17.0-beta"/>
<pod name="FirebaseFirestore" spec="10.17.0"/>
<pod name="FirebaseCrashlytics" spec="10.17.0"/>
<pod name="FirebaseFunctions" spec="10.17.0"/>
<pod name="FirebaseInstallations" spec="10.17.0"/>
<pod name="FirebaseCore" spec="10.24.0"/>
<pod name="FirebaseAuth" spec="10.24.0"/>
<pod name="FirebaseAnalytics" spec="10.24.0"/>
<!--<pod name="FirebaseAnalyticsOnDeviceConversion" spec="10.24.0"/>-->
<pod name="FirebaseMessaging" spec="10.24.0"/>
<pod name="FirebasePerformance" spec="10.24.0"/>
<pod name="FirebaseRemoteConfig" spec="10.24.0"/>
<pod name="FirebaseInAppMessaging" spec="10.24.0-beta"/>
<pod name="FirebaseFirestore" spec="10.24.0"/>
<pod name="FirebaseCrashlytics" spec="10.24.0"/>
<pod name="FirebaseFunctions" spec="10.24.0"/>
<pod name="FirebaseInstallations" spec="10.24.0"/>
<pod name="GoogleSignIn" spec="6.2.4"/>
<pod name="GoogleTagManager" spec="7.4.3"/>
<pod name="GoogleTagManager" spec="7.4.6"/>
</pods>
</podspec>

</platform>

<hook type="after_prepare" src="scripts/after_prepare.js" />
</plugin>
</plugin>
22 changes: 21 additions & 1 deletion scripts/ios/helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,26 @@ end
googlePlist["FirebaseCrashlyticsCollectionEnabled"] = (pluginVariables['FIREBASE_CRASHLYTICS_COLLECTION_ENABLED'] !== "false" ? "true" : "false") ;
googlePlistModified = true;
}
if (typeof pluginVariables['GOOGLE_ANALYTICS_ADID_COLLECTION_ENABLED'] !== 'undefined') {
googlePlist["GOOGLE_ANALYTICS_ADID_COLLECTION_ENABLED"] = (pluginVariables['GOOGLE_ANALYTICS_ADID_COLLECTION_ENABLED'] !== "false" ? "true" : "false");
googlePlistModified = true;
}
if (typeof pluginVariables['GOOGLE_ANALYTICS_DEFAULT_ALLOW_ANALYTICS_STORAGE'] !== 'undefined') {
googlePlist["GOOGLE_ANALYTICS_DEFAULT_ALLOW_ANALYTICS_STORAGE"] = (pluginVariables['GOOGLE_ANALYTICS_DEFAULT_ALLOW_ANALYTICS_STORAGE'] !== "false" ? "true" : "false");
googlePlistModified = true;
}
if (typeof pluginVariables['GOOGLE_ANALYTICS_DEFAULT_ALLOW_AD_STORAGE'] !== 'undefined') {
googlePlist["GOOGLE_ANALYTICS_DEFAULT_ALLOW_AD_STORAGE"] = (pluginVariables['GOOGLE_ANALYTICS_DEFAULT_ALLOW_AD_STORAGE'] !== "false" ? "true" : "false");
googlePlistModified = true;
}
if (typeof pluginVariables['GOOGLE_ANALYTICS_DEFAULT_ALLOW_AD_USER_DATA'] !== 'undefined') {
googlePlist["GOOGLE_ANALYTICS_DEFAULT_ALLOW_AD_USER_DATA"] = (pluginVariables['GOOGLE_ANALYTICS_DEFAULT_ALLOW_AD_USER_DATA'] !== "false" ? "true" : "false");
googlePlistModified = true;
}
if (typeof pluginVariables['GOOGLE_ANALYTICS_DEFAULT_ALLOW_AD_PERSONALIZATION_SIGNALS'] !== 'undefined') {
googlePlist["GOOGLE_ANALYTICS_DEFAULT_ALLOW_AD_PERSONALIZATION_SIGNALS"] = (pluginVariables['GOOGLE_ANALYTICS_DEFAULT_ALLOW_AD_PERSONALIZATION_SIGNALS'] !== "false" ? "true" : "false");
googlePlistModified = true;
}
if(typeof pluginVariables['IOS_SHOULD_ESTABLISH_DIRECT_CHANNEL'] !== 'undefined'){
appPlist["shouldEstablishDirectChannel"] = (pluginVariables['IOS_SHOULD_ESTABLISH_DIRECT_CHANNEL'] === "true") ;
appPlistModified = true;
Expand Down Expand Up @@ -395,4 +415,4 @@ end
fs.writeFileSync(path.resolve(iosPlatform.appPlist), plist.build(result.plist));
}
}
};
};
Loading