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

fix: 3679 - reporting with a 000000000000 matomo user id #3840

Merged
merged 11 commits into from
Apr 4, 2023
Merged

fix: 3679 - reporting with a 000000000000 matomo user id #3840

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c4a448e
fix: test that if user opts out he/she will be
Apr 2, 2023
bc8fb39
fix: implement to make test work
Apr 2, 2023
ef673a7
fix: Implement suggestions from review
Apr 2, 2023
e7c17bb
fix: change to init
sgtSeme4ki Apr 3, 2023
87562f8
fix: add comment
sgtSeme4ki Apr 3, 2023
b4810d3
fix: add explicit optOut
sgtSeme4ki Apr 3, 2023
0c7ccff
fix: remove surplus statement
sgtSeme4ki Apr 3, 2023
ac7c14e
fix: remove test
Apr 4, 2023
57f2a7d
fix: use old imports
Apr 4, 2023
0608f9b
fix: format with dart format
Apr 4, 2023
45711e2
Merge branch 'develop' into bug/3679_reporting_with_a_000000000000_ma…
monsieurtanuki Apr 4, 2023
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
19 changes: 15 additions & 4 deletions packages/smooth_app/lib/helpers/analytics_helper.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ class AnalyticsHelper {

static String latestSearch = '';

/// Did the user allow the analytic reports?
static bool _allow = false;

static Future<void> initSentry({
required Function()? appRunner,
}) async {
Expand All @@ -114,7 +117,8 @@ class AnalyticsHelper {
_crashReports = crashReports;

static Future<void> setAnalyticsReports(final bool allow) async {
await MatomoTracker.instance.setOptOut(optout: !allow);
_allow = allow;
await MatomoTracker.instance.setOptOut(optout: false);
}

static FutureOr<SentryEvent?> _beforeSend(SentryEvent event,
Expand All @@ -133,7 +137,6 @@ class AnalyticsHelper {
setAnalyticsReports(false);
return;
}

try {
await MatomoTracker.instance.initialize(
url: 'https://analytics.openfoodfacts.org/matomo.php',
Expand All @@ -146,8 +149,16 @@ class AnalyticsHelper {
}

/// A UUID must be at least one 16 characters
static String? get uuid =>
kDebugMode ? 'smoothie-debug--' : OpenFoodAPIConfiguration.uuid;
static String? get uuid {
// if user opts out then track anonymously with userId containg zeros
if (kDebugMode) {
return 'smoothie_debug--';
}
if (!_allow) {
return '0' * 16;
}
return OpenFoodAPIConfiguration.uuid;
}

static void trackEvent(
AnalyticsEvent msg, {
Expand Down