Skip to content

[firebase_analytics]Keep a local registrar to get activity for foreground actions for v1 … #1863

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

Merged
merged 2 commits into from
Jan 24, 2020
Merged

[firebase_analytics]Keep a local registrar to get activity for foreground actions for v1 … #1863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a29adaa
Keep a local registrar to get activity for foreground actions for v1 …
zhenqiu1101 Jan 23, 2020
06ebc21
Modify the pubsepc and changelog
zhenqiu1101 Jan 23, 2020
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 changes: 4 additions & 0 deletions packages/firebase_analytics/firebase_analytics/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 5.0.10

* Keep a local registrar to get activity for foreground actions for v1 embedder.

## 5.0.9

* Remove the deprecated `author:` field from pubspec.yaml
Expand Down
14 changes: 11 additions & 3 deletions ...s/android/src/main/java/io/flutter/plugins/firebaseanalytics/FirebaseAnalyticsPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,22 @@
public class FirebaseAnalyticsPlugin implements MethodCallHandler, FlutterPlugin, ActivityAware {
private FirebaseAnalytics firebaseAnalytics;
private MethodChannel methodChannel;
// Only set registrar for v1 embedder.
private PluginRegistry.Registrar registrar;
// Only set activity for v2 embedder. Always access activity from getActivity() method.
private Activity activity;

public static void registerWith(PluginRegistry.Registrar registrar) {
FirebaseAnalyticsPlugin instance = new FirebaseAnalyticsPlugin();
instance.setActivity(registrar.activity());
instance.registrar = registrar;
instance.onAttachedToEngine(registrar.context(), registrar.messenger());
}

// Only access activity with this method.
private Activity getActivity() {
return registrar != null ? registrar.activity() : activity;
}

@Override
public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) {
onAttachedToEngine(
Expand Down Expand Up @@ -120,15 +128,15 @@ private void handleSetUserId(MethodCall call, Result result) {
}

private void handleSetCurrentScreen(MethodCall call, Result result) {
if (activity == null) {
if (getActivity() == null) {
result.error("no_activity", "handleSetCurrentScreen requires a foreground activity", null);
return;
}

final String screenName = call.argument("screenName");
final String screenClassOverride = call.argument("screenClassOverride");

firebaseAnalytics.setCurrentScreen(activity, screenName, screenClassOverride);
firebaseAnalytics.setCurrentScreen(getActivity(), screenName, screenClassOverride);
result.success(null);
}

Expand Down
1 change: 1 addition & 0 deletions packages/firebase_analytics/firebase_analytics/example/android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
org.gradle.jvmargs=-Xmx1536M
android.enableJetifier=true
android.useAndroidX=true
android.enableR8=true
2 changes: 1 addition & 1 deletion packages/firebase_analytics/firebase_analytics/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: firebase_analytics
description: Flutter plugin for Google Analytics for Firebase, an app measurement
solution that provides insight on app usage and user engagement on Android and iOS.
homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/firebase_analytics/firebase_analytics
version: 5.0.9
version: 5.0.10

flutter:
plugin:
Expand Down