From 07e824ad68e713d42a9fda83d92bd885b09b6f49 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 26 Feb 2019 16:12:38 -0300
Subject: [PATCH 01/10] [android] Make crash screen scrollable and add icon

---
 .../src/main/res/drawable/ic_crash.xml        |   9 +
 .../main/res/layout/activity_dev_report.xml   | 174 ++++++++++--------
 2 files changed, 106 insertions(+), 77 deletions(-)
 create mode 100644 briar-android/src/main/res/drawable/ic_crash.xml

diff --git a/briar-android/src/main/res/drawable/ic_crash.xml b/briar-android/src/main/res/drawable/ic_crash.xml
new file mode 100644
index 000000000..9f6a33ecb
--- /dev/null
+++ b/briar-android/src/main/res/drawable/ic_crash.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="128dp"
+        android:height="128dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+	<path
+		android:fillColor="#FF000000"
+		android:pathData="M11.99,2C6.47,2 2,6.47 2,12s4.47,10 9.99,10S22,17.53 22,12 17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM16.18,7.76l-1.06,1.06 -1.06,-1.06L13,8.82l1.06,1.06L13,10.94 14.06,12l1.06,-1.06L16.18,12l1.06,-1.06 -1.06,-1.06 1.06,-1.06zM7.82,12l1.06,-1.06L9.94,12 11,10.94 9.94,9.88 11,8.82 9.94,7.76 8.88,8.82 7.82,7.76 6.76,8.82l1.06,1.06 -1.06,1.06zM12,14c-2.33,0 -4.31,1.46 -5.11,3.5h10.22c-0.8,-2.04 -2.78,-3.5 -5.11,-3.5z"/>
+</vector>
diff --git a/briar-android/src/main/res/layout/activity_dev_report.xml b/briar-android/src/main/res/layout/activity_dev_report.xml
index 516ec29cd..5f7271d55 100644
--- a/briar-android/src/main/res/layout/activity_dev_report.xml
+++ b/briar-android/src/main/res/layout/activity_dev_report.xml
@@ -129,96 +129,116 @@
 
 	</android.support.constraint.ConstraintLayout>
 
-	<android.support.constraint.ConstraintLayout
+	<ScrollView
 		android:id="@+id/request_report"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:padding="@dimen/margin_large"
+		android:fillViewport="true"
 		android:visibility="invisible"
 		tools:visibility="visible">
 
-		<TextView
-			android:id="@+id/crashed"
+		<android.support.constraint.ConstraintLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:gravity="center"
-			android:text="@string/briar_crashed"
-			android:textColor="?android:attr/textColorSecondary"
-			android:textSize="@dimen/text_size_large"
-			app:layout_constraintBottom_toTopOf="@+id/fault"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent"
-			app:layout_constraintVertical_chainStyle="packed"
-			tools:layout_editor_absoluteY="8dp"/>
+			android:padding="@dimen/margin_large">
 
-		<TextView
-			android:id="@+id/fault"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/margin_large"
-			android:gravity="center"
-			android:text="@string/not_your_fault"
-			android:textColor="?android:attr/textColorSecondary"
-			android:textSize="@dimen/text_size_large"
-			app:layout_constraintBottom_toTopOf="@+id/pleaseSend"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/crashed"/>
+			<android.support.v7.widget.AppCompatImageView
+				android:id="@+id/errorIcon"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_margin="16dp"
+				android:src="@drawable/ic_crash"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toTopOf="parent"
+				app:layout_constraintBottom_toTopOf="@+id/crashed"
+				app:layout_constraintVertical_chainStyle="packed"
+				app:tint="?attr/colorControlNormal"
+				tools:ignore="ContentDescription"/>
 
-		<TextView
-			android:id="@+id/pleaseSend"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/margin_large"
-			android:gravity="center"
-			android:text="@string/please_send_report"
-			android:textColor="?android:attr/textColorSecondary"
-			android:textSize="@dimen/text_size_large"
-			app:layout_constraintBottom_toTopOf="@+id/encrypted"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/fault"/>
+			<TextView
+				android:id="@+id/crashed"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="center"
+				android:text="@string/briar_crashed"
+				android:textColor="?android:attr/textColorSecondary"
+				android:textSize="@dimen/text_size_large"
+				app:layout_constraintBottom_toTopOf="@+id/fault"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toBottomOf="@+id/errorIcon"
+				tools:layout_editor_absoluteY="8dp"/>
 
-		<TextView
-			android:id="@+id/encrypted"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/margin_large"
-			android:gravity="center"
-			android:text="@string/report_is_encrypted"
-			android:textColor="?android:attr/textColorSecondary"
-			android:textSize="@dimen/text_size_large"
-			app:layout_constraintBottom_toTopOf="@+id/acceptButton"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/pleaseSend"/>
+			<TextView
+				android:id="@+id/fault"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/margin_large"
+				android:gravity="center"
+				android:text="@string/not_your_fault"
+				android:textColor="?android:attr/textColorSecondary"
+				android:textSize="@dimen/text_size_large"
+				app:layout_constraintBottom_toTopOf="@+id/pleaseSend"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toBottomOf="@+id/crashed"/>
 
-		<Button
-			android:id="@+id/declineButton"
-			style="@style/BriarButtonFlat.Negative"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:text="@string/close"
-			app:layout_constraintBottom_toBottomOf="@+id/acceptButton"
-			app:layout_constraintEnd_toStartOf="@+id/acceptButton"
-			app:layout_constraintHorizontal_weight="1"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="@+id/acceptButton"/>
+			<TextView
+				android:id="@+id/pleaseSend"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/margin_large"
+				android:gravity="center"
+				android:text="@string/please_send_report"
+				android:textColor="?android:attr/textColorSecondary"
+				android:textSize="@dimen/text_size_large"
+				app:layout_constraintBottom_toTopOf="@+id/encrypted"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toBottomOf="@+id/fault"/>
 
-		<Button
-			android:id="@+id/acceptButton"
-			style="@style/BriarButtonFlat.Positive"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/margin_large"
-			android:text="@string/send_report"
-			app:layout_constraintBottom_toBottomOf="parent"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintHorizontal_weight="1"
-			app:layout_constraintStart_toEndOf="@+id/declineButton"
-			app:layout_constraintTop_toBottomOf="@+id/encrypted"/>
+			<TextView
+				android:id="@+id/encrypted"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/margin_large"
+				android:gravity="center"
+				android:text="@string/report_is_encrypted"
+				android:textColor="?android:attr/textColorSecondary"
+				android:textSize="@dimen/text_size_large"
+				app:layout_constraintBottom_toTopOf="@+id/acceptButton"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toBottomOf="@+id/pleaseSend"/>
 
-	</android.support.constraint.ConstraintLayout>
+			<Button
+				android:id="@+id/declineButton"
+				style="@style/BriarButtonFlat.Negative"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:text="@string/close"
+				app:layout_constraintBottom_toBottomOf="@+id/acceptButton"
+				app:layout_constraintEnd_toStartOf="@+id/acceptButton"
+				app:layout_constraintHorizontal_weight="1"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toTopOf="@+id/acceptButton"/>
+
+			<Button
+				android:id="@+id/acceptButton"
+				style="@style/BriarButtonFlat.Positive"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/margin_large"
+				android:text="@string/send_report"
+				app:layout_constraintBottom_toBottomOf="parent"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintHorizontal_weight="1"
+				app:layout_constraintStart_toEndOf="@+id/declineButton"
+				app:layout_constraintTop_toBottomOf="@+id/encrypted"/>
+
+		</android.support.constraint.ConstraintLayout>
+
+	</ScrollView>
 
 </FrameLayout>
\ No newline at end of file

From 197800de8b0a128c5655e6aed388dfec49fd91d4 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 27 Feb 2019 12:28:41 -0300
Subject: [PATCH 02/10] [android] split crash report screen into two fragments

---
 .../android/reporting/CrashFragment.java      |  40 +++
 .../android/reporting/DevReportActivity.java  | 302 ++----------------
 .../android/reporting/ReportFormFragment.java | 286 +++++++++++++++++
 .../main/res/layout/activity_dev_report.xml   | 247 +-------------
 .../src/main/res/layout/fragment_crash.xml    | 119 +++++++
 .../main/res/layout/fragment_report_form.xml  | 113 +++++++
 6 files changed, 602 insertions(+), 505 deletions(-)
 create mode 100644 briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashFragment.java
 create mode 100644 briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java
 create mode 100644 briar-android/src/main/res/layout/fragment_crash.xml
 create mode 100644 briar-android/src/main/res/layout/fragment_report_form.xml

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashFragment.java
new file mode 100644
index 000000000..ece37d728
--- /dev/null
+++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashFragment.java
@@ -0,0 +1,40 @@
+package org.briarproject.briar.android.reporting;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.briar.R;
+
+import static java.util.Objects.requireNonNull;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+public class CrashFragment extends Fragment {
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+		View v = inflater
+				.inflate(R.layout.fragment_crash, container, false);
+
+		v.findViewById(R.id.acceptButton).setOnClickListener(view ->
+				getDevReportActivity().showReportForm(true));
+		v.findViewById(R.id.declineButton).setOnClickListener(view ->
+				getDevReportActivity().closeReport());
+
+		return v;
+	}
+
+	private DevReportActivity getDevReportActivity() {
+		return (DevReportActivity) requireNonNull(getActivity());
+	}
+
+}
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java
index d20ef8573..1388016c7 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java
@@ -2,86 +2,32 @@ package org.briarproject.briar.android.reporting;
 
 import android.content.Context;
 import android.content.res.Configuration;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
 import android.support.v7.app.AppCompatDelegate;
 import android.support.v7.widget.Toolbar;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 
-import org.acra.ReportField;
-import org.acra.collector.CrashReportData;
 import org.acra.dialog.BaseCrashReportDialog;
-import org.acra.file.CrashReportPersister;
-import org.acra.model.Element;
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.Localizer;
 import org.briarproject.briar.android.util.UserFeedback;
-import org.json.JSONException;
 
 import java.io.File;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.logging.Logger;
 
 import static android.os.Build.VERSION.SDK_INT;
-import static android.view.View.GONE;
-import static android.view.View.INVISIBLE;
-import static android.view.View.VISIBLE;
 import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
-import static android.view.inputmethod.InputMethodManager.SHOW_FORCED;
-import static java.util.logging.Level.WARNING;
+import static java.util.Objects.requireNonNull;
 import static org.acra.ACRAConstants.EXTRA_REPORT_FILE;
-import static org.acra.ReportField.ANDROID_VERSION;
-import static org.acra.ReportField.APP_VERSION_CODE;
-import static org.acra.ReportField.APP_VERSION_NAME;
-import static org.acra.ReportField.PACKAGE_NAME;
-import static org.acra.ReportField.REPORT_ID;
-import static org.acra.ReportField.STACK_TRACE;
 import static org.briarproject.briar.android.TestingConstants.PREVENT_SCREENSHOTS;
 
-public class DevReportActivity extends BaseCrashReportDialog
-		implements CompoundButton.OnCheckedChangeListener {
-
-	private static final Logger LOG =
-			Logger.getLogger(DevReportActivity.class.getName());
-
-	private static final String STATE_REVIEWING = "reviewing";
-	private static final Set<ReportField> requiredFields = new HashSet<>();
-
-	static {
-		requiredFields.add(REPORT_ID);
-		requiredFields.add(APP_VERSION_CODE);
-		requiredFields.add(APP_VERSION_NAME);
-		requiredFields.add(PACKAGE_NAME);
-		requiredFields.add(ANDROID_VERSION);
-		requiredFields.add(STACK_TRACE);
-	}
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+public class DevReportActivity extends BaseCrashReportDialog {
 
 	private AppCompatDelegate delegate;
-	private Set<ReportField> excludedFields = new HashSet<>();
-	private EditText userCommentView = null;
-	private EditText userEmailView = null;
-	private CheckBox includeDebugReport = null;
-	private Button chevron = null;
-	private LinearLayout report = null;
-	private View progress = null;
-	private MenuItem sendReport = null;
-	private boolean reviewing = false;
 
 	private AppCompatDelegate getDelegate() {
 		if (delegate == null) {
@@ -110,68 +56,21 @@ public class DevReportActivity extends BaseCrashReportDialog
 	}
 
 	@Override
-	public void init(Bundle state) {
+	public void init(@Nullable Bundle state) {
 		super.init(state);
 
 		if (PREVENT_SCREENSHOTS) getWindow().addFlags(FLAG_SECURE);
 
 		getDelegate().setContentView(R.layout.activity_dev_report);
 
-		Toolbar tb = findViewById(R.id.toolbar);
-		getDelegate().setSupportActionBar(tb);
+		Toolbar toolbar = findViewById(R.id.toolbar);
+		getDelegate().setSupportActionBar(toolbar);
 
-		View requestReport = findViewById(R.id.request_report);
-		View reportForm = findViewById(R.id.report_form);
-		userCommentView = findViewById(R.id.user_comment);
-		userEmailView = findViewById(R.id.user_email);
-		includeDebugReport = findViewById(R.id.include_debug_report);
-		chevron = findViewById(R.id.chevron);
-		report = findViewById(R.id.report_content);
-		progress = findViewById(R.id.progress_wheel);
+		String title = getString(isFeedback() ? R.string.feedback_title :
+				R.string.crash_report_title);
+		requireNonNull(getDelegate().getSupportActionBar()).setTitle(title);
 
-		//noinspection ConstantConditions
-		getDelegate().getSupportActionBar().setTitle(
-				isFeedback() ? R.string.feedback_title :
-						R.string.crash_report_title);
-		userCommentView.setHint(isFeedback() ? R.string.enter_feedback :
-				R.string.describe_crash);
-
-		if (isFeedback()) {
-			includeDebugReport
-					.setText(getString(R.string.include_debug_report_feedback));
-			reportForm.setVisibility(VISIBLE);
-			requestReport.setVisibility(INVISIBLE);
-		} else {
-			includeDebugReport.setChecked(true);
-			reportForm.setVisibility(INVISIBLE);
-			requestReport.setVisibility(VISIBLE);
-		}
-
-		findViewById(R.id.acceptButton).setOnClickListener(v -> {
-			reviewing = true;
-			reportForm.setVisibility(VISIBLE);
-			requestReport.setVisibility(INVISIBLE);
-			((InputMethodManager) getSystemService(INPUT_METHOD_SERVICE))
-					.showSoftInput(userCommentView, SHOW_FORCED);
-		});
-		findViewById(R.id.declineButton).setOnClickListener(v -> closeReport());
-		chevron.setOnClickListener(v -> {
-			boolean show =
-					chevron.getText().equals(getString(R.string.show));
-			if (show) {
-				chevron.setText(R.string.hide);
-				refresh();
-			} else {
-				chevron.setText(R.string.show);
-				report.setVisibility(GONE);
-			}
-		});
-
-		if (state != null)
-			reviewing = state.getBoolean(STATE_REVIEWING, isFeedback());
-
-		if (!isFeedback() && !reviewing)
-			requestReport.setVisibility(VISIBLE);
+		if (state == null) showReportForm(isFeedback());
 	}
 
 	@Override
@@ -181,47 +80,17 @@ public class DevReportActivity extends BaseCrashReportDialog
 	}
 
 	@Override
-	public void onPostCreate(Bundle state) {
+	public void onPostCreate(@Nullable Bundle state) {
 		super.onPostCreate(state);
 		getDelegate().onPostCreate(state);
 	}
 
-	@Override
-	public void onStart() {
-		super.onStart();
-		if (chevron.isSelected()) refresh();
-	}
-
 	@Override
 	protected void onPostResume() {
 		super.onPostResume();
 		getDelegate().onPostResume();
 	}
 
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		// Inflate the menu items for use in the action bar
-		MenuInflater inflater = getDelegate().getMenuInflater();
-		inflater.inflate(R.menu.dev_report_actions, menu);
-		sendReport = menu.findItem(R.id.action_send_report);
-		return super.onCreateOptionsMenu(menu);
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		// Handle presses on the action bar items
-		switch (item.getItemId()) {
-			case android.R.id.home:
-				onBackPressed();
-				return true;
-			case R.id.action_send_report:
-				processReport();
-				return true;
-			default:
-				return super.onOptionsItemSelected(item);
-		}
-	}
-
 	@Override
 	public void onTitleChanged(CharSequence title, int color) {
 		super.onTitleChanged(title, color);
@@ -234,12 +103,6 @@ public class DevReportActivity extends BaseCrashReportDialog
 		getDelegate().onConfigurationChanged(newConfig);
 	}
 
-	@Override
-	public void onSaveInstanceState(Bundle state) {
-		super.onSaveInstanceState(state);
-		state.putBoolean(STATE_REVIEWING, reviewing);
-	}
-
 	@Override
 	public void onStop() {
 		super.onStop();
@@ -257,132 +120,33 @@ public class DevReportActivity extends BaseCrashReportDialog
 		closeReport();
 	}
 
-	@Override
-	public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-		ReportField field = (ReportField) buttonView.getTag();
-		if (field != null) {
-			if (isChecked) excludedFields.remove(field);
-			else excludedFields.add(field);
-		}
+	void sendCrashReport(String comment, String email) {
+		sendCrash(comment, email);
 	}
 
-	@SuppressWarnings("ThrowableResultOfMethodCallIgnored")
 	private boolean isFeedback() {
 		return getException() instanceof UserFeedback;
 	}
 
-	private void refresh() {
-		report.setVisibility(INVISIBLE);
-		progress.setVisibility(VISIBLE);
-		report.removeAllViews();
-		new AsyncTask<Void, Void, CrashReportData>() {
-
-			@Override
-			protected CrashReportData doInBackground(Void... args) {
-				File reportFile = (File) getIntent().getSerializableExtra(
-						EXTRA_REPORT_FILE);
-				CrashReportPersister persister = new CrashReportPersister();
-				try {
-					return persister.load(reportFile);
-				} catch (IOException | JSONException e) {
-					LOG.log(WARNING, "Could not load report file", e);
-					return null;
-				}
-			}
-
-			@Override
-			protected void onPostExecute(CrashReportData crashData) {
-				LayoutInflater inflater = getLayoutInflater();
-				if (crashData != null) {
-					for (Entry<ReportField, Element> e : crashData.entrySet()) {
-						ReportField field = e.getKey();
-						String value = e.getValue().toString()
-								.replaceAll("\\\\n", "\n");
-						boolean required = requiredFields.contains(field);
-						boolean excluded = excludedFields.contains(field);
-						View v = inflater.inflate(R.layout.list_item_crash,
-								report, false);
-						CheckBox cb = v.findViewById(R.id.include_in_report);
-						cb.setTag(field);
-						cb.setChecked(required || !excluded);
-						cb.setEnabled(!required);
-						cb.setOnCheckedChangeListener(DevReportActivity.this);
-						cb.setText(field.toString());
-						TextView content = v.findViewById(R.id.content);
-						content.setText(value);
-						report.addView(v);
-					}
-				} else {
-					View v = inflater.inflate(
-							android.R.layout.simple_list_item_1, report, false);
-					TextView error = v.findViewById(android.R.id.text1);
-					error.setText(R.string.could_not_load_report_data);
-					report.addView(v);
-				}
-				report.setVisibility(VISIBLE);
-				progress.setVisibility(GONE);
-			}
-		}.execute();
+	void showReportForm(boolean showReportForm) {
+		Fragment f;
+		if (showReportForm) {
+			File file =
+					(File) getIntent().getSerializableExtra(EXTRA_REPORT_FILE);
+			f = ReportFormFragment.newInstance(isFeedback(), file);
+			requireNonNull(getDelegate().getSupportActionBar()).show();
+		} else {
+			f = new CrashFragment();
+			requireNonNull(getDelegate().getSupportActionBar()).hide();
+		}
+		getSupportFragmentManager().beginTransaction()
+				.replace(R.id.fragmentContainer, f)
+				.commit();
 	}
 
-	private void processReport() {
-		userCommentView.setEnabled(false);
-		userEmailView.setEnabled(false);
-		sendReport.setEnabled(false);
-		progress.setVisibility(VISIBLE);
-		boolean includeReport = !isFeedback() || includeDebugReport.isChecked();
-		new AsyncTask<Void, Void, Boolean>() {
-
-			@Override
-			protected Boolean doInBackground(Void... args) {
-				File reportFile = (File) getIntent().getSerializableExtra(
-						EXTRA_REPORT_FILE);
-				CrashReportPersister persister = new CrashReportPersister();
-				try {
-					CrashReportData data = persister.load(reportFile);
-					if (includeReport) {
-						for (ReportField field : excludedFields) {
-							LOG.info("Removing field " + field.name());
-							data.remove(field);
-						}
-					} else {
-						Iterator<Entry<ReportField, Element>> iter =
-								data.entrySet().iterator();
-						while (iter.hasNext()) {
-							Entry<ReportField, Element> e = iter.next();
-							if (!requiredFields.contains(e.getKey())) {
-								iter.remove();
-							}
-						}
-					}
-					persister.store(data, reportFile);
-					return true;
-				} catch (IOException | JSONException e) {
-					LOG.log(WARNING, "Error processing report file", e);
-					return false;
-				}
-			}
-
-			@Override
-			protected void onPostExecute(Boolean success) {
-				if (success) {
-					// Retrieve user's comment and email address, if any
-					String comment = "";
-					if (userCommentView != null)
-						comment = userCommentView.getText().toString();
-					String email = "";
-					if (userEmailView != null) {
-						email = userEmailView.getText().toString();
-					}
-					sendCrash(comment, email);
-				}
-				finish();
-			}
-		}.execute();
-	}
-
-	private void closeReport() {
+	void closeReport() {
 		cancelReports();
 		finish();
 	}
+
 }
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java
new file mode 100644
index 000000000..a90e72012
--- /dev/null
+++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java
@@ -0,0 +1,286 @@
+package org.briarproject.briar.android.reporting;
+
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.Toolbar;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import org.acra.ReportField;
+import org.acra.collector.CrashReportData;
+import org.acra.file.CrashReportPersister;
+import org.acra.model.Element;
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.briar.R;
+import org.json.JSONException;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Logger;
+
+import static android.view.MenuItem.SHOW_AS_ACTION_ALWAYS;
+import static android.view.View.GONE;
+import static android.view.View.INVISIBLE;
+import static android.view.View.VISIBLE;
+import static java.util.Objects.requireNonNull;
+import static java.util.logging.Level.WARNING;
+import static java.util.logging.Logger.getLogger;
+import static org.acra.ACRAConstants.EXTRA_REPORT_FILE;
+import static org.acra.ReportField.ANDROID_VERSION;
+import static org.acra.ReportField.APP_VERSION_CODE;
+import static org.acra.ReportField.APP_VERSION_NAME;
+import static org.acra.ReportField.PACKAGE_NAME;
+import static org.acra.ReportField.REPORT_ID;
+import static org.acra.ReportField.STACK_TRACE;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+public class ReportFormFragment extends Fragment
+		implements CompoundButton.OnCheckedChangeListener {
+
+	private static final Logger LOG =
+			getLogger(ReportFormFragment.class.getName());
+	private static final String IS_FEEDBACK = "isFeedback";
+	private static final Set<ReportField> requiredFields = new HashSet<>();
+	private static final Set<ReportField> excludedFields = new HashSet<>();
+	static {
+		requiredFields.add(REPORT_ID);
+		requiredFields.add(APP_VERSION_CODE);
+		requiredFields.add(APP_VERSION_NAME);
+		requiredFields.add(PACKAGE_NAME);
+		requiredFields.add(ANDROID_VERSION);
+		requiredFields.add(STACK_TRACE);
+	}
+
+	private boolean isFeedback;
+	private File reportFile;
+
+	private EditText userCommentView;
+	private EditText userEmailView;
+	private CheckBox includeDebugReport;
+	private Button chevron;
+	private LinearLayout report;
+	private View progress;
+	@Nullable
+	private MenuItem sendReport;
+
+	static ReportFormFragment newInstance(boolean isFeedback,
+			File reportFile) {
+		ReportFormFragment f = new ReportFormFragment();
+		Bundle args = new Bundle();
+		args.putBoolean(IS_FEEDBACK, isFeedback);
+		args.putSerializable(EXTRA_REPORT_FILE, reportFile);
+		f.setArguments(args);
+		return f;
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setHasOptionsMenu(true);
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+		View v = inflater.inflate(R.layout.fragment_report_form, container,
+				false);
+
+		userCommentView = v.findViewById(R.id.user_comment);
+		userEmailView = v.findViewById(R.id.user_email);
+		includeDebugReport = v.findViewById(R.id.include_debug_report);
+		chevron = v.findViewById(R.id.chevron);
+		report = v.findViewById(R.id.report_content);
+		progress = v.findViewById(R.id.progress_wheel);
+
+		Bundle args = requireNonNull(getArguments());
+		isFeedback = args.getBoolean(IS_FEEDBACK);
+		reportFile =
+				(File) requireNonNull(args.getSerializable(EXTRA_REPORT_FILE));
+
+		if (isFeedback) {
+			includeDebugReport
+					.setText(getString(R.string.include_debug_report_feedback));
+			userCommentView.setHint(R.string.enter_feedback);
+		} else {
+			includeDebugReport.setChecked(true);
+			userCommentView.setHint(R.string.describe_crash);
+		}
+
+		chevron.setOnClickListener(view -> {
+			boolean show = chevron.getText().equals(getString(R.string.show));
+			if (show) {
+				chevron.setText(R.string.hide);
+				refresh();
+			} else {
+				chevron.setText(R.string.show);
+				report.setVisibility(GONE);
+			}
+		});
+
+		return v;
+	}
+
+	@Override
+	public void onStart() {
+		super.onStart();
+		if (chevron.isSelected()) refresh();
+	}
+
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+		inflater.inflate(R.menu.dev_report_actions, menu);
+		sendReport = menu.findItem(R.id.action_send_report);
+		// calling setShowAsAction() shouldn't be needed, but for some reason is
+		sendReport.setShowAsAction(SHOW_AS_ACTION_ALWAYS);
+		super.onCreateOptionsMenu(menu, inflater);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		if (item.getItemId() == R.id.action_send_report) {
+			processReport();
+			return true;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+
+	@Override
+	public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+		ReportField field = (ReportField) buttonView.getTag();
+		if (field != null) {
+			if (isChecked) excludedFields.remove(field);
+			else excludedFields.add(field);
+		}
+	}
+
+	private void refresh() {
+		report.setVisibility(INVISIBLE);
+		progress.setVisibility(VISIBLE);
+		report.removeAllViews();
+		new AsyncTask<Void, Void, CrashReportData>() {
+
+			@Override
+			protected CrashReportData doInBackground(Void... args) {
+				CrashReportPersister persister = new CrashReportPersister();
+				try {
+					return persister.load(reportFile);
+				} catch (IOException | JSONException e) {
+					LOG.log(WARNING, "Could not load report file", e);
+					return null;
+				}
+			}
+
+			@Override
+			protected void onPostExecute(CrashReportData crashData) {
+				LayoutInflater inflater = getLayoutInflater();
+				if (crashData != null) {
+					for (Map.Entry<ReportField, Element> e : crashData.entrySet()) {
+						ReportField field = e.getKey();
+						String value = e.getValue().toString()
+								.replaceAll("\\\\n", "\n");
+						boolean required = requiredFields.contains(field);
+						boolean excluded = excludedFields.contains(field);
+						View v = inflater.inflate(R.layout.list_item_crash,
+								report, false);
+						CheckBox cb = v.findViewById(R.id.include_in_report);
+						cb.setTag(field);
+						cb.setChecked(required || !excluded);
+						cb.setEnabled(!required);
+						cb.setOnCheckedChangeListener(ReportFormFragment.this);
+						cb.setText(field.toString());
+						TextView content = v.findViewById(R.id.content);
+						content.setText(value);
+						report.addView(v);
+					}
+				} else {
+					View v = inflater.inflate(
+							android.R.layout.simple_list_item_1, report, false);
+					TextView error = v.findViewById(android.R.id.text1);
+					error.setText(R.string.could_not_load_report_data);
+					report.addView(v);
+				}
+				report.setVisibility(VISIBLE);
+				progress.setVisibility(GONE);
+			}
+		}.execute();
+	}
+
+	private void processReport() {
+		userCommentView.setEnabled(false);
+		userEmailView.setEnabled(false);
+		requireNonNull(sendReport).setEnabled(false);
+		progress.setVisibility(VISIBLE);
+		boolean includeReport = !isFeedback || includeDebugReport.isChecked();
+		new AsyncTask<Void, Void, Boolean>() {
+
+			@Override
+			protected Boolean doInBackground(Void... args) {
+				CrashReportPersister persister = new CrashReportPersister();
+				try {
+					CrashReportData data = persister.load(reportFile);
+					if (includeReport) {
+						for (ReportField field : excludedFields) {
+							LOG.info("Removing field " + field.name());
+							data.remove(field);
+						}
+					} else {
+						Iterator<Map.Entry<ReportField, Element>> iter =
+								data.entrySet().iterator();
+						while (iter.hasNext()) {
+							Map.Entry<ReportField, Element> e = iter.next();
+							if (!requiredFields.contains(e.getKey())) {
+								iter.remove();
+							}
+						}
+					}
+					persister.store(data, reportFile);
+					return true;
+				} catch (IOException | JSONException e) {
+					LOG.log(WARNING, "Error processing report file", e);
+					return false;
+				}
+			}
+
+			@Override
+			protected void onPostExecute(Boolean success) {
+				if (success) {
+					// Retrieve user's comment and email address, if any
+					String comment = "";
+					if (userCommentView != null)
+						comment = userCommentView.getText().toString();
+					String email = "";
+					if (userEmailView != null) {
+						email = userEmailView.getText().toString();
+					}
+					getDevReportActivity().sendCrashReport(comment, email);
+				}
+				if (getActivity() != null) getActivity().finish();
+			}
+		}.execute();
+	}
+
+	private DevReportActivity getDevReportActivity() {
+		return (DevReportActivity) requireNonNull(getActivity());
+	}
+
+}
diff --git a/briar-android/src/main/res/layout/activity_dev_report.xml b/briar-android/src/main/res/layout/activity_dev_report.xml
index 5f7271d55..c06205faf 100644
--- a/briar-android/src/main/res/layout/activity_dev_report.xml
+++ b/briar-android/src/main/res/layout/activity_dev_report.xml
@@ -1,244 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+<LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:orientation="vertical">
 
-	<android.support.constraint.ConstraintLayout
-		android:id="@+id/report_form"
+	<include
+		android:id="@+id/appBar"
+		layout="@layout/toolbar"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:visibility="visible"
-		tools:context=".android.reporting.DevReportActivity"
-		tools:visibility="invisible">
+		android:layout_height="wrap_content"/>
 
-		<include
-			android:id="@+id/appBar"
-			layout="@layout/toolbar"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent"/>
-
-		<android.support.design.widget.TextInputLayout
-			android:id="@+id/user_comment_layout"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginEnd="@dimen/margin_large"
-			android:layout_marginLeft="@dimen/margin_large"
-			android:layout_marginRight="@dimen/margin_large"
-			android:layout_marginStart="@dimen/margin_large"
-			android:layout_marginTop="@dimen/margin_large"
-			app:hintEnabled="false"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/appBar">
-
-			<android.support.design.widget.TextInputEditText
-				android:id="@+id/user_comment"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:inputType="textMultiLine|textCapSentences"
-				android:maxLines="5"
-				tools:hint="@string/describe_crash"/>
-
-		</android.support.design.widget.TextInputLayout>
-
-		<android.support.design.widget.TextInputLayout
-			android:id="@+id/user_email_layout"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginEnd="@dimen/margin_large"
-			android:layout_marginLeft="@dimen/margin_large"
-			android:layout_marginRight="@dimen/margin_large"
-			android:layout_marginStart="@dimen/margin_large"
-			app:hintEnabled="false"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/user_comment_layout">
-
-			<android.support.design.widget.TextInputEditText
-				android:id="@+id/user_email"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:hint="@string/optional_contact_email"
-				android:inputType="textEmailAddress"
-				android:maxLines="1"/>
-
-		</android.support.design.widget.TextInputLayout>
-
-		<CheckBox
-			android:id="@+id/include_debug_report"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginLeft="@dimen/margin_large"
-			android:layout_marginStart="@dimen/margin_large"
-			android:checked="false"
-			android:text="@string/include_debug_report_crash"
-			app:layout_constraintBottom_toBottomOf="@+id/chevron"
-			app:layout_constraintEnd_toStartOf="@+id/chevron"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="@+id/chevron"/>
-
-		<Button
-			android:id="@+id/chevron"
-			style="@style/BriarButtonFlat.Positive"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/show"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/user_email_layout"/>
-
-		<ScrollView
-			android:id="@+id/report_scroll"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/include_debug_report">
-
-			<LinearLayout
-				android:id="@+id/report_content"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:gravity="center_horizontal"
-				android:orientation="vertical"
-				android:paddingBottom="@dimen/listitem_height_one_line_avatar"
-				android:paddingEnd="@dimen/margin_large"
-				android:paddingStart="@dimen/margin_large"
-				android:paddingTop="@dimen/margin_small"
-				android:visibility="gone"
-				tools:visibility="visible"/>
-
-		</ScrollView>
-
-		<ProgressBar
-			android:id="@+id/progress_wheel"
-			style="?android:attr/progressBarStyleLarge"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:indeterminate="true"
-			android:visibility="gone"
-			app:layout_constraintBottom_toBottomOf="parent"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/include_debug_report"
-			tools:visibility="visible"/>
-
-	</android.support.constraint.ConstraintLayout>
-
-	<ScrollView
-		android:id="@+id/request_report"
+	<FrameLayout
+		android:id="@+id/fragmentContainer"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:fillViewport="true"
-		android:visibility="invisible"
-		tools:visibility="visible">
+		android:layout_height="match_parent"/>
 
-		<android.support.constraint.ConstraintLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:padding="@dimen/margin_large">
-
-			<android.support.v7.widget.AppCompatImageView
-				android:id="@+id/errorIcon"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_margin="16dp"
-				android:src="@drawable/ic_crash"
-				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toTopOf="parent"
-				app:layout_constraintBottom_toTopOf="@+id/crashed"
-				app:layout_constraintVertical_chainStyle="packed"
-				app:tint="?attr/colorControlNormal"
-				tools:ignore="ContentDescription"/>
-
-			<TextView
-				android:id="@+id/crashed"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:gravity="center"
-				android:text="@string/briar_crashed"
-				android:textColor="?android:attr/textColorSecondary"
-				android:textSize="@dimen/text_size_large"
-				app:layout_constraintBottom_toTopOf="@+id/fault"
-				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toBottomOf="@+id/errorIcon"
-				tools:layout_editor_absoluteY="8dp"/>
-
-			<TextView
-				android:id="@+id/fault"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="@dimen/margin_large"
-				android:gravity="center"
-				android:text="@string/not_your_fault"
-				android:textColor="?android:attr/textColorSecondary"
-				android:textSize="@dimen/text_size_large"
-				app:layout_constraintBottom_toTopOf="@+id/pleaseSend"
-				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toBottomOf="@+id/crashed"/>
-
-			<TextView
-				android:id="@+id/pleaseSend"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="@dimen/margin_large"
-				android:gravity="center"
-				android:text="@string/please_send_report"
-				android:textColor="?android:attr/textColorSecondary"
-				android:textSize="@dimen/text_size_large"
-				app:layout_constraintBottom_toTopOf="@+id/encrypted"
-				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toBottomOf="@+id/fault"/>
-
-			<TextView
-				android:id="@+id/encrypted"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="@dimen/margin_large"
-				android:gravity="center"
-				android:text="@string/report_is_encrypted"
-				android:textColor="?android:attr/textColorSecondary"
-				android:textSize="@dimen/text_size_large"
-				app:layout_constraintBottom_toTopOf="@+id/acceptButton"
-				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toBottomOf="@+id/pleaseSend"/>
-
-			<Button
-				android:id="@+id/declineButton"
-				style="@style/BriarButtonFlat.Negative"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:text="@string/close"
-				app:layout_constraintBottom_toBottomOf="@+id/acceptButton"
-				app:layout_constraintEnd_toStartOf="@+id/acceptButton"
-				app:layout_constraintHorizontal_weight="1"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toTopOf="@+id/acceptButton"/>
-
-			<Button
-				android:id="@+id/acceptButton"
-				style="@style/BriarButtonFlat.Positive"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="@dimen/margin_large"
-				android:text="@string/send_report"
-				app:layout_constraintBottom_toBottomOf="parent"
-				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintHorizontal_weight="1"
-				app:layout_constraintStart_toEndOf="@+id/declineButton"
-				app:layout_constraintTop_toBottomOf="@+id/encrypted"/>
-
-		</android.support.constraint.ConstraintLayout>
-
-	</ScrollView>
-
-</FrameLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/briar-android/src/main/res/layout/fragment_crash.xml b/briar-android/src/main/res/layout/fragment_crash.xml
new file mode 100644
index 000000000..8dd38ac77
--- /dev/null
+++ b/briar-android/src/main/res/layout/fragment_crash.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<ScrollView
+		android:id="@+id/request_report"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:fillViewport="true">
+
+		<android.support.constraint.ConstraintLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:padding="@dimen/margin_large">
+
+			<android.support.v7.widget.AppCompatImageView
+				android:id="@+id/errorIcon"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_margin="16dp"
+				android:src="@drawable/ic_crash"
+				app:layout_constraintBottom_toTopOf="@+id/crashed"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toTopOf="parent"
+				app:layout_constraintVertical_chainStyle="packed"
+				app:tint="?attr/colorControlNormal"
+				tools:ignore="ContentDescription"/>
+
+			<TextView
+				android:id="@+id/crashed"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="center"
+				android:text="@string/briar_crashed"
+				android:textColor="?android:attr/textColorSecondary"
+				android:textSize="@dimen/text_size_large"
+				app:layout_constraintBottom_toTopOf="@+id/fault"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toBottomOf="@+id/errorIcon"
+				tools:layout_editor_absoluteY="8dp"/>
+
+			<TextView
+				android:id="@+id/fault"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/margin_large"
+				android:gravity="center"
+				android:text="@string/not_your_fault"
+				android:textColor="?android:attr/textColorSecondary"
+				android:textSize="@dimen/text_size_large"
+				app:layout_constraintBottom_toTopOf="@+id/pleaseSend"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toBottomOf="@+id/crashed"/>
+
+			<TextView
+				android:id="@+id/pleaseSend"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/margin_large"
+				android:gravity="center"
+				android:text="@string/please_send_report"
+				android:textColor="?android:attr/textColorSecondary"
+				android:textSize="@dimen/text_size_large"
+				app:layout_constraintBottom_toTopOf="@+id/encrypted"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toBottomOf="@+id/fault"/>
+
+			<TextView
+				android:id="@+id/encrypted"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/margin_large"
+				android:gravity="center"
+				android:text="@string/report_is_encrypted"
+				android:textColor="?android:attr/textColorSecondary"
+				android:textSize="@dimen/text_size_large"
+				app:layout_constraintBottom_toTopOf="@+id/acceptButton"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toBottomOf="@+id/pleaseSend"/>
+
+			<Button
+				android:id="@+id/declineButton"
+				style="@style/BriarButtonFlat.Negative"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:text="@string/close"
+				app:layout_constraintBottom_toBottomOf="@+id/acceptButton"
+				app:layout_constraintEnd_toStartOf="@+id/acceptButton"
+				app:layout_constraintHorizontal_weight="1"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toTopOf="@+id/acceptButton"/>
+
+			<Button
+				android:id="@+id/acceptButton"
+				style="@style/BriarButtonFlat.Positive"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/margin_large"
+				android:text="@string/send_report"
+				app:layout_constraintBottom_toBottomOf="parent"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintHorizontal_weight="1"
+				app:layout_constraintStart_toEndOf="@+id/declineButton"
+				app:layout_constraintTop_toBottomOf="@+id/encrypted"/>
+
+		</android.support.constraint.ConstraintLayout>
+
+	</ScrollView>
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/fragment_report_form.xml b/briar-android/src/main/res/layout/fragment_report_form.xml
new file mode 100644
index 000000000..b69eea3ae
--- /dev/null
+++ b/briar-android/src/main/res/layout/fragment_report_form.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools">
+
+	<android.support.design.widget.TextInputLayout
+		android:id="@+id/user_comment_layout"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginEnd="@dimen/margin_large"
+		android:layout_marginLeft="@dimen/margin_large"
+		android:layout_marginRight="@dimen/margin_large"
+		android:layout_marginStart="@dimen/margin_large"
+		android:layout_marginTop="@dimen/margin_large"
+		app:hintEnabled="false"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent">
+
+		<android.support.design.widget.TextInputEditText
+			android:id="@+id/user_comment"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:inputType="textMultiLine|textCapSentences"
+			android:maxLines="5"
+			tools:hint="@string/describe_crash"/>
+
+	</android.support.design.widget.TextInputLayout>
+
+	<android.support.design.widget.TextInputLayout
+		android:id="@+id/user_email_layout"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginEnd="@dimen/margin_large"
+		android:layout_marginLeft="@dimen/margin_large"
+		android:layout_marginRight="@dimen/margin_large"
+		android:layout_marginStart="@dimen/margin_large"
+		app:hintEnabled="false"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/user_comment_layout">
+
+		<android.support.design.widget.TextInputEditText
+			android:id="@+id/user_email"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:hint="@string/optional_contact_email"
+			android:inputType="textEmailAddress"
+			android:maxLines="1"/>
+
+	</android.support.design.widget.TextInputLayout>
+
+	<CheckBox
+		android:id="@+id/include_debug_report"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginLeft="@dimen/margin_large"
+		android:layout_marginStart="@dimen/margin_large"
+		android:checked="false"
+		android:text="@string/include_debug_report_crash"
+		app:layout_constraintBottom_toBottomOf="@+id/chevron"
+		app:layout_constraintEnd_toStartOf="@+id/chevron"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="@+id/chevron"/>
+
+	<Button
+		android:id="@+id/chevron"
+		style="@style/BriarButtonFlat.Positive"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="@string/show"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/user_email_layout"/>
+
+	<ScrollView
+		android:id="@+id/report_scroll"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@id/include_debug_report">
+
+		<LinearLayout
+			android:id="@+id/report_content"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:gravity="center_horizontal"
+			android:orientation="vertical"
+			android:paddingBottom="@dimen/listitem_height_one_line_avatar"
+			android:paddingEnd="@dimen/margin_large"
+			android:paddingStart="@dimen/margin_large"
+			android:paddingTop="@dimen/margin_small"
+			android:visibility="gone"
+			tools:visibility="visible"/>
+
+	</ScrollView>
+
+	<ProgressBar
+		android:id="@+id/progress_wheel"
+		style="?android:attr/progressBarStyleLarge"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:indeterminate="true"
+		android:visibility="gone"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/include_debug_report"
+		tools:visibility="visible"/>
+
+</android.support.constraint.ConstraintLayout>

From 861dbe20b169cb02f0c84802ac6827860be6406f Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 27 Feb 2019 12:55:21 -0300
Subject: [PATCH 03/10] [android] Fix crash screen buttons to the bottom of the
 screen

and resize crash icon to the available screen space
---
 .../src/main/res/layout/fragment_crash.xml    | 68 ++++++++++---------
 1 file changed, 36 insertions(+), 32 deletions(-)

diff --git a/briar-android/src/main/res/layout/fragment_crash.xml b/briar-android/src/main/res/layout/fragment_crash.xml
index 8dd38ac77..a92013190 100644
--- a/briar-android/src/main/res/layout/fragment_crash.xml
+++ b/briar-android/src/main/res/layout/fragment_crash.xml
@@ -7,10 +7,13 @@
 	android:layout_height="match_parent">
 
 	<ScrollView
-		android:id="@+id/request_report"
+		android:id="@+id/scrollView"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:fillViewport="true">
+		android:layout_height="0dp"
+		android:fillViewport="true"
+		app:layout_constraintBottom_toTopOf="@+id/acceptButton"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent">
 
 		<android.support.constraint.ConstraintLayout
 			android:layout_width="match_parent"
@@ -19,12 +22,14 @@
 
 			<android.support.v7.widget.AppCompatImageView
 				android:id="@+id/errorIcon"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_margin="16dp"
+				android:layout_width="0dp"
+				android:layout_height="0dp"
+				android:padding="8dp"
 				android:src="@drawable/ic_crash"
 				app:layout_constraintBottom_toTopOf="@+id/crashed"
+				app:layout_constraintDimensionRatio="1:1"
 				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintHeight_max="128dp"
 				app:layout_constraintStart_toStartOf="parent"
 				app:layout_constraintTop_toTopOf="parent"
 				app:layout_constraintVertical_chainStyle="packed"
@@ -82,38 +87,37 @@
 				android:text="@string/report_is_encrypted"
 				android:textColor="?android:attr/textColorSecondary"
 				android:textSize="@dimen/text_size_large"
-				app:layout_constraintBottom_toTopOf="@+id/acceptButton"
+				app:layout_constraintBottom_toBottomOf="parent"
 				app:layout_constraintEnd_toEndOf="parent"
 				app:layout_constraintStart_toStartOf="parent"
 				app:layout_constraintTop_toBottomOf="@+id/pleaseSend"/>
 
-			<Button
-				android:id="@+id/declineButton"
-				style="@style/BriarButtonFlat.Negative"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:text="@string/close"
-				app:layout_constraintBottom_toBottomOf="@+id/acceptButton"
-				app:layout_constraintEnd_toStartOf="@+id/acceptButton"
-				app:layout_constraintHorizontal_weight="1"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toTopOf="@+id/acceptButton"/>
-
-			<Button
-				android:id="@+id/acceptButton"
-				style="@style/BriarButtonFlat.Positive"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="@dimen/margin_large"
-				android:text="@string/send_report"
-				app:layout_constraintBottom_toBottomOf="parent"
-				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintHorizontal_weight="1"
-				app:layout_constraintStart_toEndOf="@+id/declineButton"
-				app:layout_constraintTop_toBottomOf="@+id/encrypted"/>
-
 		</android.support.constraint.ConstraintLayout>
 
 	</ScrollView>
 
+	<Button
+		android:id="@+id/declineButton"
+		style="@style/BriarButtonFlat.Negative"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:text="@string/close"
+		app:layout_constraintBottom_toBottomOf="@+id/acceptButton"
+		app:layout_constraintEnd_toStartOf="@+id/acceptButton"
+		app:layout_constraintHorizontal_weight="1"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="@+id/acceptButton"/>
+
+	<Button
+		android:id="@+id/acceptButton"
+		style="@style/BriarButtonFlat.Positive"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:text="@string/send_report"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintHorizontal_weight="1"
+		app:layout_constraintStart_toEndOf="@+id/declineButton"
+		app:layout_constraintTop_toBottomOf="@+id/scrollView"/>
+
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file

From 89d24b1753497c4c62eb43d07e29034bf04bba4a Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 27 Feb 2019 13:09:54 -0300
Subject: [PATCH 04/10] [android] Make entire report form scrollable, not only
 the hidden data

---
 .../main/res/layout/fragment_report_form.xml  | 182 +++++++++---------
 1 file changed, 91 insertions(+), 91 deletions(-)

diff --git a/briar-android/src/main/res/layout/fragment_report_form.xml b/briar-android/src/main/res/layout/fragment_report_form.xml
index b69eea3ae..810268949 100644
--- a/briar-android/src/main/res/layout/fragment_report_form.xml
+++ b/briar-android/src/main/res/layout/fragment_report_form.xml
@@ -1,86 +1,84 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<ScrollView
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools">
+	android:fillViewport="true">
 
-	<android.support.design.widget.TextInputLayout
-		android:id="@+id/user_comment_layout"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/margin_large"
-		android:layout_marginLeft="@dimen/margin_large"
-		android:layout_marginRight="@dimen/margin_large"
-		android:layout_marginStart="@dimen/margin_large"
-		android:layout_marginTop="@dimen/margin_large"
-		app:hintEnabled="false"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent">
-
-		<android.support.design.widget.TextInputEditText
-			android:id="@+id/user_comment"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:inputType="textMultiLine|textCapSentences"
-			android:maxLines="5"
-			tools:hint="@string/describe_crash"/>
-
-	</android.support.design.widget.TextInputLayout>
-
-	<android.support.design.widget.TextInputLayout
-		android:id="@+id/user_email_layout"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/margin_large"
-		android:layout_marginLeft="@dimen/margin_large"
-		android:layout_marginRight="@dimen/margin_large"
-		android:layout_marginStart="@dimen/margin_large"
-		app:hintEnabled="false"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/user_comment_layout">
-
-		<android.support.design.widget.TextInputEditText
-			android:id="@+id/user_email"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:hint="@string/optional_contact_email"
-			android:inputType="textEmailAddress"
-			android:maxLines="1"/>
-
-	</android.support.design.widget.TextInputLayout>
-
-	<CheckBox
-		android:id="@+id/include_debug_report"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_marginLeft="@dimen/margin_large"
-		android:layout_marginStart="@dimen/margin_large"
-		android:checked="false"
-		android:text="@string/include_debug_report_crash"
-		app:layout_constraintBottom_toBottomOf="@+id/chevron"
-		app:layout_constraintEnd_toStartOf="@+id/chevron"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="@+id/chevron"/>
-
-	<Button
-		android:id="@+id/chevron"
-		style="@style/BriarButtonFlat.Positive"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="@string/show"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/user_email_layout"/>
-
-	<ScrollView
-		android:id="@+id/report_scroll"
+	<android.support.constraint.ConstraintLayout
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@id/include_debug_report">
+		android:layout_height="wrap_content">
+
+		<android.support.design.widget.TextInputLayout
+			android:id="@+id/user_comment_layout"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginEnd="@dimen/margin_large"
+			android:layout_marginLeft="@dimen/margin_large"
+			android:layout_marginRight="@dimen/margin_large"
+			android:layout_marginStart="@dimen/margin_large"
+			android:layout_marginTop="@dimen/margin_large"
+			app:hintEnabled="false"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent">
+
+			<android.support.design.widget.TextInputEditText
+				android:id="@+id/user_comment"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:inputType="textMultiLine|textCapSentences"
+				android:maxLines="5"
+				tools:hint="@string/describe_crash"/>
+
+		</android.support.design.widget.TextInputLayout>
+
+		<android.support.design.widget.TextInputLayout
+			android:id="@+id/user_email_layout"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginEnd="@dimen/margin_large"
+			android:layout_marginLeft="@dimen/margin_large"
+			android:layout_marginRight="@dimen/margin_large"
+			android:layout_marginStart="@dimen/margin_large"
+			app:hintEnabled="false"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/user_comment_layout">
+
+			<android.support.design.widget.TextInputEditText
+				android:id="@+id/user_email"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:hint="@string/optional_contact_email"
+				android:inputType="textEmailAddress"
+				android:maxLines="1"/>
+
+		</android.support.design.widget.TextInputLayout>
+
+		<CheckBox
+			android:id="@+id/include_debug_report"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="@dimen/margin_large"
+			android:layout_marginStart="@dimen/margin_large"
+			android:checked="false"
+			android:text="@string/include_debug_report_crash"
+			app:layout_constraintBottom_toBottomOf="@+id/chevron"
+			app:layout_constraintEnd_toStartOf="@+id/chevron"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="@+id/chevron"/>
+
+		<Button
+			android:id="@+id/chevron"
+			style="@style/BriarButtonFlat.Positive"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/show"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/user_email_layout"/>
 
 		<LinearLayout
 			android:id="@+id/report_content"
@@ -93,21 +91,23 @@
 			android:paddingStart="@dimen/margin_large"
 			android:paddingTop="@dimen/margin_small"
 			android:visibility="gone"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/include_debug_report"
 			tools:visibility="visible"/>
 
-	</ScrollView>
+		<ProgressBar
+			android:id="@+id/progress_wheel"
+			style="?android:attr/progressBarStyleLarge"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:indeterminate="true"
+			android:visibility="gone"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/include_debug_report"
+			tools:visibility="visible"/>
 
-	<ProgressBar
-		android:id="@+id/progress_wheel"
-		style="?android:attr/progressBarStyleLarge"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:indeterminate="true"
-		android:visibility="gone"
-		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/include_debug_report"
-		tools:visibility="visible"/>
+	</android.support.constraint.ConstraintLayout>
 
-</android.support.constraint.ConstraintLayout>
+</ScrollView>
\ No newline at end of file

From bd2bbe9268b24ac033e62ec71a320d1b92432a56 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 28 Feb 2019 16:25:29 -0300
Subject: [PATCH 05/10] [android] don't show JSON in feedback/crash report

use key-value pairs instead

Closes #1426
---
 .../briar/android/reporting/ReportFormFragment.java   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java
index a90e72012..40811cce6 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java
@@ -4,7 +4,6 @@ import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
-import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -194,10 +193,14 @@ public class ReportFormFragment extends Fragment
 			protected void onPostExecute(CrashReportData crashData) {
 				LayoutInflater inflater = getLayoutInflater();
 				if (crashData != null) {
-					for (Map.Entry<ReportField, Element> e : crashData.entrySet()) {
+					for (Map.Entry<ReportField, Element> e : crashData
+							.entrySet()) {
 						ReportField field = e.getKey();
-						String value = e.getValue().toString()
-								.replaceAll("\\\\n", "\n");
+						StringBuilder valueBuilder = new StringBuilder();
+						for (String pair : e.getValue().flatten()) {
+							valueBuilder.append(pair).append("\n");
+						}
+						String value = valueBuilder.toString();
 						boolean required = requiredFields.contains(field);
 						boolean excluded = excludedFields.contains(field);
 						View v = inflater.inflate(R.layout.list_item_crash,

From 3c8c0e579eeba431ed0d89bf8755b4eea0156fb4 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 28 Feb 2019 16:33:25 -0300
Subject: [PATCH 06/10] [android] point ACRA to correct BuildConfig class

Fixes #1061
---
 .../org/briarproject/briar/android/BriarApplicationImpl.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/BriarApplicationImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/BriarApplicationImpl.java
index ba909c75b..c0b3c3da7 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/BriarApplicationImpl.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/BriarApplicationImpl.java
@@ -20,6 +20,7 @@ import org.acra.annotation.ReportsCrashes;
 import org.briarproject.bramble.BrambleAndroidModule;
 import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.briar.BriarCoreModule;
+import org.briarproject.briar.BuildConfig;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.logging.CachingLogHandler;
 import org.briarproject.briar.android.reporting.BriarReportPrimer;
@@ -64,6 +65,7 @@ import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
 		reportDialogClass = DevReportActivity.class,
 		resDialogOkToast = R.string.dev_report_saved,
 		deleteOldUnsentReportsOnApplicationStart = false,
+		buildConfigClass = BuildConfig.class,
 		customReportContent = {
 				REPORT_ID,
 				APP_VERSION_CODE, APP_VERSION_NAME, PACKAGE_NAME,

From 7d9380d3d60929eef3594444a99e9dbc39f147ed Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 1 Mar 2019 09:49:47 -0300
Subject: [PATCH 07/10] [android] go to homescreen after pressing back in crash
 reporter

Fixes #1390
---
 .../briar/android/reporting/DevReportActivity.java     | 10 ++++++++++
 .../briar/android/reporting/ReportFormFragment.java    |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java
index 1388016c7..a0187fc4a 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java
@@ -1,6 +1,7 @@
 package org.briarproject.briar.android.reporting;
 
 import android.content.Context;
+import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -13,10 +14,14 @@ import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.Localizer;
+import org.briarproject.briar.android.logout.HideUiActivity;
 import org.briarproject.briar.android.util.UserFeedback;
 
 import java.io.File;
 
+import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+import static android.content.Intent.FLAG_ACTIVITY_NO_ANIMATION;
 import static android.os.Build.VERSION.SDK_INT;
 import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
 import static java.util.Objects.requireNonNull;
@@ -146,6 +151,11 @@ public class DevReportActivity extends BaseCrashReportDialog {
 
 	void closeReport() {
 		cancelReports();
+		Intent i = new Intent(this, HideUiActivity.class);
+		i.addFlags(FLAG_ACTIVITY_NEW_TASK
+				| FLAG_ACTIVITY_NO_ANIMATION
+				| FLAG_ACTIVITY_CLEAR_TASK);
+		startActivity(i);
 		finish();
 	}
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java
index 40811cce6..075d2cedf 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java
@@ -277,7 +277,7 @@ public class ReportFormFragment extends Fragment
 					}
 					getDevReportActivity().sendCrashReport(comment, email);
 				}
-				if (getActivity() != null) getActivity().finish();
+				if (getActivity() != null) getDevReportActivity().closeReport();
 			}
 		}.execute();
 	}

From e965021e3d9be7cbc6fe609f050135eeb632da4f Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 10 Jun 2019 12:57:56 -0300
Subject: [PATCH 08/10] [android] don't clear task when submitting feedback,
 only after crash

---
 .../briar/android/reporting/DevReportActivity.java   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java
index a0187fc4a..20734d60a 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java
@@ -151,11 +151,13 @@ public class DevReportActivity extends BaseCrashReportDialog {
 
 	void closeReport() {
 		cancelReports();
-		Intent i = new Intent(this, HideUiActivity.class);
-		i.addFlags(FLAG_ACTIVITY_NEW_TASK
-				| FLAG_ACTIVITY_NO_ANIMATION
-				| FLAG_ACTIVITY_CLEAR_TASK);
-		startActivity(i);
+		if (!isFeedback()) {
+			Intent i = new Intent(this, HideUiActivity.class);
+			i.addFlags(FLAG_ACTIVITY_NEW_TASK
+					| FLAG_ACTIVITY_NO_ANIMATION
+					| FLAG_ACTIVITY_CLEAR_TASK);
+			startActivity(i);
+		}
 		finish();
 	}
 

From 3f600980991080a2e0169cb1e01c480548c2e65c Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 10 Jun 2019 13:27:27 -0300
Subject: [PATCH 09/10] [android] don't cancel crash reports after sending them

---
 .../briar/android/reporting/DevReportActivity.java            | 4 ++++
 .../briar/android/reporting/ReportFormFragment.java           | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java
index 20734d60a..b18d72d4d 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java
@@ -151,6 +151,10 @@ public class DevReportActivity extends BaseCrashReportDialog {
 
 	void closeReport() {
 		cancelReports();
+		exit();
+	}
+
+	void exit() {
 		if (!isFeedback()) {
 			Intent i = new Intent(this, HideUiActivity.class);
 			i.addFlags(FLAG_ACTIVITY_NEW_TASK
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java
index 075d2cedf..2c4a873b9 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java
@@ -277,7 +277,7 @@ public class ReportFormFragment extends Fragment
 					}
 					getDevReportActivity().sendCrashReport(comment, email);
 				}
-				if (getActivity() != null) getDevReportActivity().closeReport();
+				if (getActivity() != null) getDevReportActivity().exit();
 			}
 		}.execute();
 	}

From ea5a8622423a5dc4e71a60b1354fa70aaa58da10 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 18 Jun 2019 13:28:28 -0300
Subject: [PATCH 10/10] [android] Fix send button in ReportForm's action bar

---
 .../briar/android/reporting/CrashFragment.java      |  2 +-
 .../briar/android/reporting/DevReportActivity.java  | 13 ++++++++++---
 .../briar/android/reporting/ReportFormFragment.java |  5 +++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashFragment.java
index ece37d728..102cdbf11 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashFragment.java
@@ -26,7 +26,7 @@ public class CrashFragment extends Fragment {
 				.inflate(R.layout.fragment_crash, container, false);
 
 		v.findViewById(R.id.acceptButton).setOnClickListener(view ->
-				getDevReportActivity().showReportForm(true));
+				getDevReportActivity().displayFragment(true));
 		v.findViewById(R.id.declineButton).setOnClickListener(view ->
 				getDevReportActivity().closeReport());
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java
index b18d72d4d..d958f1494 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java
@@ -75,7 +75,7 @@ public class DevReportActivity extends BaseCrashReportDialog {
 				R.string.crash_report_title);
 		requireNonNull(getDelegate().getSupportActionBar()).setTitle(title);
 
-		if (state == null) showReportForm(isFeedback());
+		if (state == null) displayFragment(isFeedback());
 	}
 
 	@Override
@@ -133,7 +133,7 @@ public class DevReportActivity extends BaseCrashReportDialog {
 		return getException() instanceof UserFeedback;
 	}
 
-	void showReportForm(boolean showReportForm) {
+	void displayFragment(boolean showReportForm) {
 		Fragment f;
 		if (showReportForm) {
 			File file =
@@ -145,8 +145,15 @@ public class DevReportActivity extends BaseCrashReportDialog {
 			requireNonNull(getDelegate().getSupportActionBar()).hide();
 		}
 		getSupportFragmentManager().beginTransaction()
-				.replace(R.id.fragmentContainer, f)
+				.replace(R.id.fragmentContainer, f, f.getTag())
 				.commit();
+
+	}
+
+	@Override
+	public void invalidateOptionsMenu() {
+		super.invalidateOptionsMenu();
+		getDelegate().invalidateOptionsMenu();
 	}
 
 	void closeReport() {
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java
index 2c4a873b9..7de1b5f85 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java
@@ -13,6 +13,7 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -52,7 +53,7 @@ import static org.acra.ReportField.STACK_TRACE;
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
 public class ReportFormFragment extends Fragment
-		implements CompoundButton.OnCheckedChangeListener {
+		implements OnCheckedChangeListener {
 
 	private static final Logger LOG =
 			getLogger(ReportFormFragment.class.getName());
@@ -91,7 +92,7 @@ public class ReportFormFragment extends Fragment
 	}
 
 	@Override
-	public void onCreate(Bundle savedInstanceState) {
+	public void onCreate(@Nullable Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setHasOptionsMenu(true);
 	}