fix: key names

Author: matinzd

packages/firebase_analytics/firebase_analytics/android/src/main/java/io/flutter/plugins/firebase/analytics/Constants.java

@@ -9,7 +9,7 @@
 public class Constants {
   public static final String AD_STORAGE_CONSENT_GRANTED = "adStorageConsentGranted";
   public static final String ANALYTICS_STORAGE_CONSENT_GRANTED = "analyticsStorageConsentGranted";
-  public static final String AD_PERSONALIZATION_CONSENT_GRANTED = "adPersonalizationConsentGranted";
+  public static final String AD_PERSONALIZATION_SIGNALS_CONSENT_GRANTED = "adPersonalizationSignalsConsentGranted";
   public static final String AD_USER_DATA_CONSENT_GRANTED = "adUserDataConsentGranted";
   public static final String USER_ID = "userId";
   public static final String EVENT_NAME = "eventName";

packages/firebase_analytics/firebase_analytics/android/src/main/java/io/flutter/plugins/firebase/analytics/FlutterFirebaseAnalyticsPlugin.java

@@ -291,8 +291,8 @@ private Task<Void> setConsent(final Map<String, Object> arguments) {
                 (Boolean) arguments.get(Constants.AD_STORAGE_CONSENT_GRANTED);
             final Boolean analyticsStorageGranted =
                 (Boolean) arguments.get(Constants.ANALYTICS_STORAGE_CONSENT_GRANTED);
-            final Boolean adPersonalizationGranted =
-                (Boolean) arguments.get(Constants.AD_PERSONALIZATION_CONSENT_GRANTED);
+            final Boolean adPersonalizationSignalsGranted =
+                (Boolean) arguments.get(Constants.AD_PERSONALIZATION_SIGNALS_CONSENT_GRANTED);
             final Boolean adUserDataGranted =
                 (Boolean) arguments.get(Constants.AD_USER_DATA_CONSENT_GRANTED);
             HashMap<FirebaseAnalytics.ConsentType, FirebaseAnalytics.ConsentStatus> parameters =
@@ -314,10 +314,10 @@ private Task<Void> setConsent(final Map<String, Object> arguments) {
                       : FirebaseAnalytics.ConsentStatus.DENIED);
             }
 
-            if (adPersonalizationGranted != null) {
+            if (adPersonalizationSignalsGranted != null) {
               parameters.put(
                   FirebaseAnalytics.ConsentType.AD_PERSONALIZATION,
-                  adPersonalizationGranted
+                  adPersonalizationSignalsGranted
                       ? FirebaseAnalytics.ConsentStatus.GRANTED
                       : FirebaseAnalytics.ConsentStatus.DENIED);
             }

packages/firebase_analytics/firebase_analytics/ios/Classes/FLTFirebaseAnalyticsPlugin.m

@@ -15,7 +15,7 @@
 NSString *const kFLTFirebaseAnalyticsParameters = @"parameters";
 NSString *const kFLTFirebaseAnalyticsAdStorageConsentGranted = @"adStorageConsentGranted";
 NSString *const kFLTFirebaseAnalyticsStorageConsentGranted = @"analyticsStorageConsentGranted";
-NSString *const kFLTFirebaseAdPersonalizationConsentGranted = @"adPersonalizationConsentGranted";
+NSString *const kFLTFirebaseAdPersonalizationSignalsConsentGranted = @"adPersonalizationSignalsConsentGranted";
 NSString *const kFLTFirebaseAdUserDataConsentGranted = @"adUserDataConsentGranted";
 NSString *const kFLTFirebaseAnalyticsUserId = @"userId";
 
@@ -139,7 +139,7 @@ - (void)resetAnalyticsDataWithMethodCallResult:(FLTFirebaseMethodCallResult *)re
 - (void)setConsent:(id)arguments withMethodCallResult:(FLTFirebaseMethodCallResult *)result {
   NSNumber *adStorageGranted = arguments[kFLTFirebaseAnalyticsAdStorageConsentGranted];
   NSNumber *analyticsStorageGranted = arguments[kFLTFirebaseAnalyticsStorageConsentGranted];
-  NSNumber *adPersonalizationGranted = arguments[kFLTFirebaseAdPersonalizationConsentGranted];
+  NSNumber *adPersonalizationSignalsGranted = arguments[kFLTFirebaseAdPersonalizationSignalsConsentGranted];
   NSNumber *adUserDataGranted = arguments[kFLTFirebaseAdUserDataConsentGranted];
 
   NSMutableDictionary<FIRConsentType, FIRConsentStatus> *parameters =
@@ -154,9 +154,9 @@ - (void)setConsent:(id)arguments withMethodCallResult:(FLTFirebaseMethodCallResu
         [analyticsStorageGranted boolValue] ? FIRConsentStatusGranted : FIRConsentStatusDenied;
   }
 
-  if (adPersonalizationGranted != nil) {
+  if (adPersonalizationSignalsGranted != nil) {
     parameters[FIRConsentTypeAnalyticsStorage] =
-        [adPersonalizationGranted boolValue] ? FIRConsentStatusGranted : FIRConsentStatusDenied;
+        [adPersonalizationSignalsGranted boolValue] ? FIRConsentStatusGranted : FIRConsentStatusDenied;
   }
 
   if (adUserDataGranted != nil) {

packages/firebase_analytics/firebase_analytics/lib/src/firebase_analytics.dart

@@ -137,14 +137,14 @@ class FirebaseAnalytics extends FirebasePluginPlatform {
   Future<void> setConsent({
     bool? adStorageConsentGranted,
     bool? analyticsStorageConsentGranted,
-    bool? adPersonalizationGranted,
-    bool? adUserDataGranted,
+    bool? adPersonalizationSignalsConsentGranted,
+    bool? adUserDataConsentGranted,
   }) async {
     await _delegate.setConsent(
       adStorageConsentGranted: adStorageConsentGranted,
       analyticsStorageConsentGranted: analyticsStorageConsentGranted,
-      adPersonalizationGranted: adPersonalizationGranted,
-      adUserDataGranted: adUserDataGranted,
+      adPersonalizationSignalsConsentGranted: adPersonalizationSignalsConsentGranted,
+      adUserDataConsentGranted: adUserDataConsentGranted,
     );
   }
 

packages/firebase_analytics/firebase_analytics_platform_interface/lib/src/method_channel/method_channel_firebase_analytics.dart

@@ -73,8 +73,8 @@ class MethodChannelFirebaseAnalytics extends FirebaseAnalyticsPlatform {
   Future<void> setConsent({
     bool? adStorageConsentGranted,
     bool? analyticsStorageConsentGranted,
-    bool? adPersonalizationGranted,
-    bool? adUserDataGranted,
+    bool? adPersonalizationSignalsConsentGranted,
+    bool? adUserDataConsentGranted,
   }) async {
     try {
       return channel.invokeMethod<void>(
@@ -84,9 +84,9 @@ class MethodChannelFirebaseAnalytics extends FirebaseAnalyticsPlatform {
             'adStorageConsentGranted': adStorageConsentGranted,
           if (analyticsStorageConsentGranted != null)
             'analyticsStorageConsentGranted': analyticsStorageConsentGranted,
-          if (adPersonalizationGranted != null)
-            'adPersonalizationGranted': adPersonalizationGranted,
-          if (adUserDataGranted != null) 'adUserDataGranted': adUserDataGranted,
+          if (adPersonalizationSignalsConsentGranted != null)
+            'adPersonalizationSignalsConsentGranted': adPersonalizationSignalsConsentGranted,
+          if (adUserDataConsentGranted != null) 'adUserDataConsentGranted': adUserDataConsentGranted,
         },
       );
     } catch (e, s) {

packages/firebase_analytics/firebase_analytics_platform_interface/lib/src/platform_interface/platform_interface_firebase_analytics.dart

@@ -170,8 +170,8 @@ abstract class FirebaseAnalyticsPlatform extends PlatformInterface {
   Future<void> setConsent({
     bool? adStorageConsentGranted,
     bool? analyticsStorageConsentGranted,
-    bool? adPersonalizationGranted,
-    bool? adUserDataGranted,
+    bool? adPersonalizationSignalsConsentGranted,
+    bool? adUserDataConsentGranted,
   }) {
     throw UnimplementedError('setConsent() is not implemented');
   }

packages/firebase_analytics/firebase_analytics_web/lib/firebase_analytics_web.dart

@@ -67,8 +67,8 @@ class FirebaseAnalyticsWeb extends FirebaseAnalyticsPlatform {
   Future<void> setConsent({
     bool? adStorageConsentGranted,
     bool? analyticsStorageConsentGranted,
-    bool? adPersonalizationGranted,
-    bool? adUserDataGranted,
+    bool? adPersonalizationSignalsConsentGranted,
+    bool? adUserDataConsentGranted,
   }) async {
     throw UnimplementedError('setConsent() is not supported on Web.');
   }

packages/firebase_analytics/firebase_analytics_web/test/firebase_analytics_web_test.mocks.dart

@@ -1,7 +1,3 @@
-// Copyright 2024, the Chromium project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
 // Mocks generated by Mockito 5.4.4 from annotations
 // in firebase_analytics_web/test/firebase_analytics_web_test.dart.
 // Do not manually edit this file.
@@ -146,8 +142,8 @@ class MockFirebaseAnalyticsWeb extends _i1.Mock
   _i5.Future<void> setConsent({
     bool? adStorageConsentGranted,
     bool? analyticsStorageConsentGranted,
-    bool? adPersonalizationGranted,
-    bool? adUserDataGranted,
+    bool? adPersonalizationSignalsConsentGranted,
+    bool? adUserDataConsentGranted,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -156,8 +152,9 @@ class MockFirebaseAnalyticsWeb extends _i1.Mock
           {
             #adStorageConsentGranted: adStorageConsentGranted,
             #analyticsStorageConsentGranted: analyticsStorageConsentGranted,
-            #adPersonalizationGranted: adPersonalizationGranted,
-            #adUserDataGranted: adUserDataGranted,
+            #adPersonalizationSignalsConsentGranted:
+                adPersonalizationSignalsConsentGranted,
+            #adUserDataConsentGranted: adUserDataConsentGranted,
           },
         ),
         returnValue: _i5.Future<void>.value(),