Skip to content

Commit

Permalink
UI option for auto sending crash reports on Android
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexeyBarabash committed Aug 27, 2021
1 parent 8369187 commit 71f90c0
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@
import org.chromium.base.Log;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.BraveConfig;
import org.chromium.chrome.browser.metrics.UmaSessionStats;
import org.chromium.chrome.browser.preferences.BravePref;
import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
import org.chromium.chrome.browser.preferences.Pref;
import org.chromium.chrome.browser.preferences.website.BraveShieldsContentSettings;
import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl;
import org.chromium.chrome.browser.privacy.settings.PrivacySettings;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.settings.BraveDialogPreference;
Expand Down Expand Up @@ -63,6 +65,7 @@ public class BravePrivacySettings extends PrivacySettings {
private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
private static final String PREF_HTTPS_EVERYWHERE = "https_everywhere";
private static final String PREF_SEND_P3A = "send_p3a_analytics";
private static final String PREF_SEND_CRASH_REPORTS = "send_crash_reports";
private static final String PREF_BRAVE_STATS_USAGE_PING = "brave_stats_usage_ping";
private static final String PREF_SEARCH_SUGGESTIONS = "search_suggestions";
private static final String PREF_AUTOCOMPLETE_TOP_SITES = "autocomplete_top_sites";
Expand Down Expand Up @@ -92,15 +95,17 @@ public class BravePrivacySettings extends PrivacySettings {
PREF_OTHER_PRIVACY_SETTINGS_SECTION, // other section
PREF_WEBRTC_POLICY, PREF_SAFE_BROWSING, PREF_CAN_MAKE_PAYMENT, PREF_UNSTOPPABLE_DOMAINS,
PREF_ETH_NAMED_SERVICE, PREF_IPFS_GATEWAY, PREF_SECURE_DNS, PREF_DO_NOT_TRACK,
PREF_CLOSE_TABS_ON_EXIT, PREF_SEND_P3A, PREF_BRAVE_STATS_USAGE_PING,
PREF_SEARCH_SUGGESTIONS, PREF_AUTOCOMPLETE_TOP_SITES,
PREF_CLOSE_TABS_ON_EXIT, PREF_SEND_P3A, PREF_SEND_CRASH_REPORTS,
PREF_BRAVE_STATS_USAGE_PING, PREF_SEARCH_SUGGESTIONS, PREF_AUTOCOMPLETE_TOP_SITES,
PREF_AUTOCOMPLETE_BRAVE_SUGGESTED_SITES, PREF_USAGE_STATS, PREF_PRIVACY_SANDBOX};

private final int STRICT = 0;
private final int STANDARD = 1;
private final int ALLOW = 2;

private final PrefService mPrefServiceBridge = UserPrefs.get(Profile.getLastUsedRegularProfile());
private final PrivacyPreferencesManagerImpl mPrivacyPrefManager =
PrivacyPreferencesManagerImpl.getInstance();
private final ChromeManagedPreferenceDelegate mManagedPreferenceDelegate =
createManagedPreferenceDelegate();
private ChromeSwitchPreference mSearchSuggestions;
Expand All @@ -114,6 +119,7 @@ public class BravePrivacySettings extends PrivacySettings {
private ChromeSwitchPreference mBlockScriptsPref;
private ChromeSwitchPreference mCloseTabsOnExitPref;
private ChromeSwitchPreference mSendP3A;
private ChromeSwitchPreference mSendCrashReports;
private ChromeSwitchPreference mBraveStatsUsagePing;
private ChromeSwitchPreference mIpfsGatewayPref;
private PreferenceCategory mSocialBlockingCategory;
Expand Down Expand Up @@ -170,6 +176,8 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
mSendP3A = (ChromeSwitchPreference) findPreference(PREF_SEND_P3A);
mSendP3A.setOnPreferenceChangeListener(this);

mSendCrashReports = (ChromeSwitchPreference) findPreference(PREF_SEND_CRASH_REPORTS);
mSendCrashReports.setOnPreferenceChangeListener(this);
mBraveStatsUsagePing = (ChromeSwitchPreference) findPreference(PREF_BRAVE_STATS_USAGE_PING);
mBraveStatsUsagePing.setOnPreferenceChangeListener(this);

Expand Down Expand Up @@ -286,6 +294,8 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
sharedPreferencesEditor.putBoolean(PREF_CLOSE_TABS_ON_EXIT, (boolean) newValue);
} else if (PREF_SEND_P3A.equals(key)) {
BravePrefServiceBridge.getInstance().setP3AEnabled((boolean) newValue);
} else if (PREF_SEND_CRASH_REPORTS.equals(key)) {
UmaSessionStats.changeMetricsReportingConsent((boolean) newValue);
} else if (PREF_BRAVE_STATS_USAGE_PING.equals(key)) {
BravePrefServiceBridge.getInstance().setStatsReportingEnabled((boolean) newValue);
} else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
Expand Down Expand Up @@ -421,6 +431,8 @@ private void updatePreferences() {
getPreferenceScreen().removePreference(mSendP3A);
}

mSendCrashReports.setChecked(mPrivacyPrefManager.isUsageAndCrashReportingPermittedByUser());

mBraveStatsUsagePing.setChecked(
BravePrefServiceBridge.getInstance().getStatsReportingEnabled());

Expand Down
7 changes: 6 additions & 1 deletion android/java/res/xml/brave_privacy_preferences.xml
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,16 @@
android:title="@string/send_p3a_analytics_title"
android:summary="@string/send_p3a_analytics_summary"
android:defaultValue="false" />
<org.chromium.components.browser_ui.settings.ChromeSwitchPreference
android:key="send_crash_reports"
android:order="25"
android:title="@string/send_crash_reports_title"
android:summary="@string/send_crash_reports_summary"
android:defaultValue="false" />
<org.chromium.components.browser_ui.settings.ChromeSwitchPreference
android:key="brave_stats_usage_ping"
android:order="25"
android:title="@string/brave_stats_usage_ping_title"
android:summary="@string/brave_stats_usage_ping_summary"
android:defaultValue="true" />

</PreferenceScreen>
8 changes: 7 additions & 1 deletion browser/ui/android/strings/android_brave_strings.grd
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,13 @@ This file contains all "about" strings. It is set to NOT be translated, in tran
Allow privacy-preserving product analytics (P3A)
</message>
<message name="IDS_SEND_P3A_ANALYTICS_SUMMARY" desc="Summary for checkbox of send p3a analytics.">
This completely anonymised info helps Brave estimate the overall usage of certain features and make it better for you.
Anonymized P3A info helps Brave estimate overall usage, and ensure we’re improving popular features.
</message>
<message name="IDS_SEND_CRASH_REPORTS_TITLE" desc="Title for checkbox of send crash reports automatically.">
Automatically send crash reports
</message>
<message name="IDS_SEND_CRASH_REPORTS_SUMMARY" desc="Summary for checkbox of send crash reports automatically.">
Crash reports help Brave improve product stability for all users.
</message>
<message name="IDS_BRAVE_STATS_TEXT_DATA_SAVED" desc="Title for the data saved stats">
Est. Data\nSaved
Expand Down

0 comments on commit 71f90c0

Please sign in to comment.