Skip to content

refactor(firebase_analytics): remove deprecated Tasks.call for android and replace with TaskCompletionSource. #8583

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 4 commits into from
Jun 16, 2022
Merged

refactor(firebase_analytics): remove deprecated Tasks.call for android and replace with TaskCompletionSource. #8583

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
37a065c
refactor(analytics): remove deprecated Tasks.call
russellwheatley May 4, 2022
552d563
fix(analytics): update implementation
russellwheatley May 10, 2022
58163f6
formatted
russellwheatley May 18, 2022
cc015d0
Merge branch 'master' into @russell/analytics-tasks-call
russellwheatley Jun 16, 2022
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
217 changes: 148 additions & 69 deletions ...d/src/main/java/io/flutter/plugins/firebase/analytics/FlutterFirebaseAnalyticsPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import android.os.Parcelable;
import androidx.annotation.NonNull;
import com.google.android.gms.tasks.Task;
import com.google.android.gms.tasks.Tasks;
import com.google.android.gms.tasks.TaskCompletionSource;
import com.google.firebase.FirebaseApp;
import com.google.firebase.analytics.FirebaseAnalytics;
import io.flutter.embedding.engine.plugins.FlutterPlugin;
Expand Down Expand Up @@ -149,120 +149,199 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
}

private Task<Void> handleLogEvent(final Map<String, Object> arguments) {
return Tasks.call(
cachedThreadPool,
TaskCompletionSource<Void> taskCompletionSource = new TaskCompletionSource<>();

cachedThreadPool.execute(
() -> {
final String eventName =
(String) Objects.requireNonNull(arguments.get(Constants.EVENT_NAME));
@SuppressWarnings("unchecked")
final Map<String, Object> map = (Map<String, Object>) arguments.get(Constants.PARAMETERS);
final Bundle parameterBundle = createBundleFromMap(map);
analytics.logEvent(eventName, parameterBundle);
return null;
try {
final String eventName =
(String) Objects.requireNonNull(arguments.get(Constants.EVENT_NAME));
@SuppressWarnings("unchecked")
final Map<String, Object> map =
(Map<String, Object>) arguments.get(Constants.PARAMETERS);
final Bundle parameterBundle = createBundleFromMap(map);
analytics.logEvent(eventName, parameterBundle);
taskCompletionSource.setResult(null);
} catch (Exception e) {
taskCompletionSource.setException(e);
}
});

return taskCompletionSource.getTask();
}

private Task<Void> handleSetUserId(final Map<String, Object> arguments) {
return Tasks.call(
cachedThreadPool,
TaskCompletionSource<Void> taskCompletionSource = new TaskCompletionSource<>();

cachedThreadPool.execute(
() -> {
final String id = (String) arguments.get(Constants.USER_ID);
analytics.setUserId(id);
return null;
try {
final String id = (String) arguments.get(Constants.USER_ID);
analytics.setUserId(id);
taskCompletionSource.setResult(null);
} catch (Exception e) {
taskCompletionSource.setException(e);
}
});

return taskCompletionSource.getTask();
}

private Task<Void> handleSetAnalyticsCollectionEnabled(final Map<String, Object> arguments) {
return Tasks.call(
cachedThreadPool,
TaskCompletionSource<Void> taskCompletionSource = new TaskCompletionSource<>();

cachedThreadPool.execute(
() -> {
final Boolean enabled =
(Boolean) Objects.requireNonNull(arguments.get(Constants.ENABLED));
analytics.setAnalyticsCollectionEnabled(enabled);
return null;
try {
final Boolean enabled =
(Boolean) Objects.requireNonNull(arguments.get(Constants.ENABLED));
analytics.setAnalyticsCollectionEnabled(enabled);
taskCompletionSource.setResult(null);
} catch (Exception e) {
taskCompletionSource.setException(e);
}
});

return taskCompletionSource.getTask();
}

private Task<Void> handleSetSessionTimeoutDuration(final Map<String, Object> arguments) {
return Tasks.call(
cachedThreadPool,
TaskCompletionSource<Void> taskCompletionSource = new TaskCompletionSource<>();

cachedThreadPool.execute(
() -> {
final Integer milliseconds =
(Integer) Objects.requireNonNull(arguments.get(Constants.MILLISECONDS));
analytics.setSessionTimeoutDuration(milliseconds);
return null;
try {
final Integer milliseconds =
(Integer) Objects.requireNonNull(arguments.get(Constants.MILLISECONDS));
analytics.setSessionTimeoutDuration(milliseconds);
taskCompletionSource.setResult(null);
} catch (Exception e) {
taskCompletionSource.setException(e);
}
});

return taskCompletionSource.getTask();
}

private Task<Void> handleSetUserProperty(final Map<String, Object> arguments) {
return Tasks.call(
cachedThreadPool,
TaskCompletionSource<Void> taskCompletionSource = new TaskCompletionSource<>();

cachedThreadPool.execute(
() -> {
final String name = (String) Objects.requireNonNull(arguments.get(Constants.NAME));
final String value = (String) arguments.get(Constants.VALUE);
analytics.setUserProperty(name, value);
return null;
try {
final String name = (String) Objects.requireNonNull(arguments.get(Constants.NAME));
final String value = (String) arguments.get(Constants.VALUE);
analytics.setUserProperty(name, value);
taskCompletionSource.setResult(null);
} catch (Exception e) {
taskCompletionSource.setException(e);
}
});

return taskCompletionSource.getTask();
}

private Task<Void> handleResetAnalyticsData() {
return Tasks.call(
cachedThreadPool,
TaskCompletionSource<Void> taskCompletionSource = new TaskCompletionSource<>();

cachedThreadPool.execute(
() -> {
analytics.resetAnalyticsData();
return null;
try {
analytics.resetAnalyticsData();
taskCompletionSource.setResult(null);
} catch (Exception e) {
taskCompletionSource.setException(e);
}
});

return taskCompletionSource.getTask();
}

private Task<Void> setConsent(final Map<String, Object> arguments) {
return Tasks.call(
cachedThreadPool,
TaskCompletionSource<Void> taskCompletionSource = new TaskCompletionSource<>();

cachedThreadPool.execute(
() -> {
final Boolean adStorageGranted =
(Boolean) arguments.get(Constants.AD_STORAGE_CONSENT_GRANTED);
final Boolean analyticsStorageGranted =
(Boolean) arguments.get(Constants.ANALYTICS_STORAGE_CONSENT_GRANTED);
HashMap<FirebaseAnalytics.ConsentType, FirebaseAnalytics.ConsentStatus> parameters =
new HashMap<>();

if (adStorageGranted != null) {
parameters.put(
FirebaseAnalytics.ConsentType.AD_STORAGE,
adStorageGranted
? FirebaseAnalytics.ConsentStatus.GRANTED
: FirebaseAnalytics.ConsentStatus.DENIED);
}
try {
final Boolean adStorageGranted =
(Boolean) arguments.get(Constants.AD_STORAGE_CONSENT_GRANTED);
final Boolean analyticsStorageGranted =
(Boolean) arguments.get(Constants.ANALYTICS_STORAGE_CONSENT_GRANTED);
HashMap<FirebaseAnalytics.ConsentType, FirebaseAnalytics.ConsentStatus> parameters =
new HashMap<>();

if (analyticsStorageGranted != null) {
parameters.put(
FirebaseAnalytics.ConsentType.ANALYTICS_STORAGE,
analyticsStorageGranted
? FirebaseAnalytics.ConsentStatus.GRANTED
: FirebaseAnalytics.ConsentStatus.DENIED);
}
if (adStorageGranted != null) {
parameters.put(
FirebaseAnalytics.ConsentType.AD_STORAGE,
adStorageGranted
? FirebaseAnalytics.ConsentStatus.GRANTED
: FirebaseAnalytics.ConsentStatus.DENIED);
}

if (analyticsStorageGranted != null) {
parameters.put(
FirebaseAnalytics.ConsentType.ANALYTICS_STORAGE,
analyticsStorageGranted
? FirebaseAnalytics.ConsentStatus.GRANTED
: FirebaseAnalytics.ConsentStatus.DENIED);
}

analytics.setConsent(parameters);
return null;
analytics.setConsent(parameters);
taskCompletionSource.setResult(null);
} catch (Exception e) {
taskCompletionSource.setException(e);
}
});

return taskCompletionSource.getTask();
}

private Task<Void> setDefaultEventParameters(final Map<String, Object> arguments) {
return Tasks.call(
cachedThreadPool,
TaskCompletionSource<Void> taskCompletionSource = new TaskCompletionSource<>();

cachedThreadPool.execute(
() -> {
Map<String, Object> parameters = Objects.requireNonNull(arguments);
analytics.setDefaultEventParameters(createBundleFromMap(parameters));
return null;
try {
Map<String, Object> parameters = Objects.requireNonNull(arguments);
analytics.setDefaultEventParameters(createBundleFromMap(parameters));
taskCompletionSource.setResult(null);
} catch (Exception e) {
taskCompletionSource.setException(e);
}
});

return taskCompletionSource.getTask();
}

@Override
public Task<Map<String, Object>> getPluginConstantsForFirebaseApp(FirebaseApp firebaseApp) {
return Tasks.call(() -> new HashMap<String, Object>() {});
TaskCompletionSource<Map<String, Object>> taskCompletionSource = new TaskCompletionSource<>();

cachedThreadPool.execute(
() -> {
try {
taskCompletionSource.setResult(new HashMap<String, Object>() {});
} catch (Exception e) {
taskCompletionSource.setException(e);
}
});

return taskCompletionSource.getTask();
}

@Override
public Task<Void> didReinitializeFirebaseCore() {
return Tasks.call(() -> null);
TaskCompletionSource<Void> taskCompletionSource = new TaskCompletionSource<>();

cachedThreadPool.execute(
() -> {
try {
taskCompletionSource.setResult(null);
} catch (Exception e) {
taskCompletionSource.setException(e);
}
});

return taskCompletionSource.getTask();
}
}