Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 10:49:06 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1979-feedback-crash' into 'master'

Browse Source 
Don't crash when pressing SHOW with user information when sending feedback

Closes #1979

See merge request briar/briar!1418
This commit is contained in:
akwizgran
2021-03-25 13:29:43 +00:00
parent 87799b743c ecb31a4d32
commit c4a654b267
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportData.java
View File

@@ -51,15 +51,15 @@ class ReportData {
final boolean isOptional;
boolean isIncluded = true;
ReportItem(String name, int nameRes, ReportInfo info) {
ReportItem(String name, @StringRes int nameRes, ReportInfo info) {
this(name, nameRes, info, true);
}
ReportItem(String name, int nameRes, String info) {
ReportItem(String name, @StringRes int nameRes, String info) {
this(name, nameRes, new SingleReportInfo(info), true);
}
ReportItem(String name, int nameRes, ReportInfo info,
ReportItem(String name, @StringRes int nameRes, ReportInfo info,
boolean isOptional) {
this.name = name;
this.nameRes = nameRes;

4
briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportViewModel.java
View File

@@ -15,6 +15,7 @@ import org.briarproject.briar.android.logging.BriefLogFormatter;
import org.briarproject.briar.android.logging.CachingLogHandler;
import org.briarproject.briar.android.logging.LogDecrypter;
import org.briarproject.briar.android.reporting.ReportData.MultiReportInfo;
import org.briarproject.briar.android.reporting.ReportData.ReportItem;
import org.briarproject.briar.android.viewmodel.LiveEvent;
import org.briarproject.briar.android.viewmodel.MutableLiveEvent;
import org.json.JSONException;
@@ -156,7 +157,8 @@ class ReportViewModel extends AndroidViewModel {
MultiReportInfo userInfo = new MultiReportInfo();
if (!isNullOrEmpty(comment)) userInfo.add("Comment", comment);
if (!isNullOrEmpty(email)) userInfo.add("Email", email);
data.add(new ReportData.ReportItem("UserInfo", 0, userInfo, false));
data.add(new ReportItem("UserInfo", R.string.dev_report_user_info,
userInfo, false));
}
// check the state of the TorPlugin, if this is feedback

1
briar-android/src/main/res/values/strings.xml
View File

@@ -573,6 +573,7 @@
<string name="optional_contact_email">Your email address (optional)</string>
<string name="include_debug_report_crash">Include anonymous data about the crash</string>
<string name="include_debug_report_feedback">Include anonymous data about this device</string>
<string name="dev_report_user_info">User information</string>
<string name="dev_report_basic_info">Basic information</string>
<string name="dev_report_device_info">Device information</string>
<string name="dev_report_stacktrace">Stacktrace</string>