From ecb31a4d32be726dec0d1ef1a39950e1664f8bc9 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 25 Mar 2021 08:47:18 -0300
Subject: [PATCH] Don't crash when pressing SHOW with user information when
 sending feedback

---
 .../briarproject/briar/android/reporting/ReportData.java    | 6 +++---
 .../briar/android/reporting/ReportViewModel.java            | 4 +++-
 briar-android/src/main/res/values/strings.xml               | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportData.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportData.java
index 1b45580cd..a1c580766 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportData.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportData.java
@@ -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;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportViewModel.java
index a7648fa00..ef8679b7b 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportViewModel.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportViewModel.java
@@ -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
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index faa7ae0d9..e92c9350e 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -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>