From 7d9380d3d60929eef3594444a99e9dbc39f147ed Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Fri, 1 Mar 2019 09:49:47 -0300 Subject: [PATCH] [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(); }