cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

never enable analytics if Tor is enabled

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-07-19 10:31:58 +02:00
parent e62cfd0185
commit 2e7fca846e
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/analytics/AnalyticsManager.java
View File

@@ -153,10 +153,10 @@ public class AnalyticsManager implements OnSharedPreferenceChangeListener {
} }
public synchronized void refreshSettings(Context context) { public synchronized void refreshSettings(Context context) {
boolean analyticsHasConsent = Preferences.getPreferences(context).isAnalyticsHasConsent(); boolean shouldEnableAnalytics = shouldEnableAnalytics(context);
boolean analyticsEnabled = piwikTracker != null; boolean analyticsEnabled = piwikTracker != null;
if (analyticsHasConsent != analyticsEnabled) { if (shouldEnableAnalytics != analyticsEnabled) {
if (analyticsHasConsent) { if (shouldEnableAnalytics) {
TrackerConfig trackerConfig; TrackerConfig trackerConfig;
if (Constants.DEBUG) { if (Constants.DEBUG) {
trackerConfig = new TrackerConfig("https://piwik.openkeychain.org/", 3, "OpenKeychainDebug"); trackerConfig = new TrackerConfig("https://piwik.openkeychain.org/", 3, "OpenKeychainDebug");
@@ -172,4 +172,9 @@ public class AnalyticsManager implements OnSharedPreferenceChangeListener {
} }
} }
} }
private boolean shouldEnableAnalytics(Context context) {
Preferences preferences = Preferences.getPreferences(context);
return preferences.isAnalyticsHasConsent() && !preferences.getUseTorProxy();
}
} }