Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 21:29:54 +01:00
Code Issues Projects Releases Wiki Activity

[android] go to homescreen after pressing back in crash reporter

Browse Source 
Fixes #1390
This commit is contained in:
Torsten Grote
2019-03-01 09:49:47 -03:00
parent 3c8c0e579e
commit 7d9380d3d6
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java
View File

@@ -1,6 +1,7 @@
package org.briarproject.briar.android.reporting; package org.briarproject.briar.android.reporting;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; 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.bramble.api.nullsafety.ParametersNotNullByDefault;
import org.briarproject.briar.R; import org.briarproject.briar.R;
import org.briarproject.briar.android.Localizer; import org.briarproject.briar.android.Localizer;
import org.briarproject.briar.android.logout.HideUiActivity;
import org.briarproject.briar.android.util.UserFeedback; import org.briarproject.briar.android.util.UserFeedback;
import java.io.File; 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.os.Build.VERSION.SDK_INT;
import static android.view.WindowManager.LayoutParams.FLAG_SECURE; import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
import static java.util.Objects.requireNonNull; import static java.util.Objects.requireNonNull;
@@ -146,6 +151,11 @@ public class DevReportActivity extends BaseCrashReportDialog {
void closeReport() { void closeReport() {
cancelReports(); 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(); finish();
} }

2
briar-android/src/main/java/org/briarproject/briar/android/reporting/ReportFormFragment.java
View File

@@ -277,7 +277,7 @@ public class ReportFormFragment extends Fragment
} }
getDevReportActivity().sendCrashReport(comment, email); getDevReportActivity().sendCrashReport(comment, email);
} }
if (getActivity() != null) getActivity().finish(); if (getActivity() != null) getDevReportActivity().closeReport();
} }
}.execute(); }.execute();
} }