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

fix(firebase_analytics): allow null values for setDefaultEventParameters() which removes defaults. Permissible on android and iOS. #9135

Merged
merged 5 commits into from Jul 21, 2022
Merged

fix(firebase_analytics): allow null values for setDefaultEventParameters() which removes defaults. Permissible on android and iOS. #9135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a8c3eb1
setDefaultEventParameters should accept nullable values
ueman Jul 18, 2022
f607dab
object is nullable too
ueman Jul 18, 2022
08de0ef
Merge branch 'master' into fix-9005
russellwheatley Jul 20, 2022
56b554f
Merge branch 'master' into fix-9005
ueman Jul 20, 2022
26e4427
add e2e test
ueman Jul 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...d/src/main/java/io/flutter/plugins/firebase/analytics/FlutterFirebaseAnalyticsPlugin.java
View file
Open in desktop
Expand Up @@ -302,8 +302,7 @@ private Task<Void> setDefaultEventParameters(final Map<String, Object> arguments
cachedThreadPool.execute(
() -> {
try {
Map<String, Object> parameters = Objects.requireNonNull(arguments);
analytics.setDefaultEventParameters(createBundleFromMap(parameters));
analytics.setDefaultEventParameters(createBundleFromMap(arguments));
taskCompletionSource.setResult(null);
} catch (Exception e) {
taskCompletionSource.setException(e);
Expand Down
2 changes: 1 addition & 1 deletion packages/firebase_analytics/firebase_analytics/lib/src/firebase_analytics.dart
View file
Open in desktop
Expand Up @@ -120,7 +120,7 @@ class FirebaseAnalytics extends FirebasePluginPlatform {

/// Adds parameters that will be set on every event logged from the SDK, including automatic ones.
Future<void> setDefaultEventParameters(
Map<String, Object> defaultParameters,
Map<String, Object?>? defaultParameters,
) async {
await _delegate.setDefaultEventParameters(defaultParameters);
}
Expand Down
2 changes: 1 addition & 1 deletion ...nalytics_platform_interface/lib/src/method_channel/method_channel_firebase_analytics.dart
View file
Open in desktop
Expand Up @@ -82,7 +82,7 @@ class MethodChannelFirebaseAnalytics extends FirebaseAnalyticsPlatform {

@override
Future<void> setDefaultEventParameters(
Map<String, Object> defaultParameters,
Map<String, Object?>? defaultParameters,
) async {
try {
return channel.invokeMethod<void>(
Expand Down
2 changes: 1 addition & 1 deletion ..._platform_interface/lib/src/platform_interface/platform_interface_firebase_analytics.dart
View file
Open in desktop
Expand Up @@ -139,7 +139,7 @@ abstract class FirebaseAnalyticsPlatform extends PlatformInterface {

/// Adds parameters that will be set on every event logged from the SDK, including automatic ones.
Future<void> setDefaultEventParameters(
Map<String, Object> defaultParameters,
Map<String, Object?>? defaultParameters,
) {
throw UnimplementedError('setDefaultEventParameters() is not implemented');
}
Expand Down
2 changes: 1 addition & 1 deletion packages/firebase_analytics/firebase_analytics_web/lib/firebase_analytics_web.dart
View file
Open in desktop
Expand Up @@ -129,7 +129,7 @@ class FirebaseAnalyticsWeb extends FirebaseAnalyticsPlatform {

@override
Future<void> setDefaultEventParameters(
Map<String, Object> defaultParameters,
Map<String, Object?>? defaultParameters,
) async {
throw UnimplementedError(
'setDefaultEventParameters() is not supported on web',
Expand Down
22 changes: 22 additions & 0 deletions tests/test_driver/firebase_analytics/firebase_analytics_e2e.dart
View file
Open in desktop
Expand Up @@ -189,12 +189,34 @@ void setupTests() {
.setDefaultEventParameters({'default': 'parameters'}),
throwsA(isA<UnimplementedError>()),
);
// reset a single default parameter
await expectLater(
FirebaseAnalytics.instance
.setDefaultEventParameters({'default': null}),
throwsA(isA<UnimplementedError>()),
);
// reset all default parameters
await expectLater(
FirebaseAnalytics.instance.setDefaultEventParameters(null),
throwsA(isA<UnimplementedError>()),
);
} else {
await expectLater(
FirebaseAnalytics.instance
.setDefaultEventParameters({'default': 'parameters'}),
completes,
);
// reset a single default parameter
await expectLater(
FirebaseAnalytics.instance
.setDefaultEventParameters({'default': null}),
completes,
);
// reset all default parameters
await expectLater(
FirebaseAnalytics.instance.setDefaultEventParameters(null),
completes,
);
}
},
);
Expand Down