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] [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);
 	}
-- 
GitLab