From b23c0b599b74cc04898af50cd09a3d76d9aa7e83 Mon Sep 17 00:00:00 2001 From: akwizgran <michael@briarproject.org> Date: Mon, 4 Dec 2017 15:25:12 +0000 Subject: [PATCH] Don't show screen filter dialog after onSaveInstanceState(). --- .../briarproject/briar/android/activity/BaseActivity.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java index 218f5b13ca..88e6302ecb 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java @@ -4,6 +4,7 @@ import android.os.Bundle; import android.os.IBinder; import android.support.annotation.LayoutRes; import android.support.annotation.UiThread; +import android.support.v4.app.FragmentManager; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.view.View; @@ -138,7 +139,9 @@ public abstract class BaseActivity extends AppCompatActivity dialogFrag = ScreenFilterDialogFragment.newInstance(new ArrayList<>(apps)); dialogFrag.setCancelable(false); - dialogFrag.show(getSupportFragmentManager(), dialogFrag.getTag()); + // Show dialog unless onSaveInstanceState() has been called, see #1112 + FragmentManager fm = getSupportFragmentManager(); + if (!fm.isStateSaved()) dialogFrag.show(fm, dialogFrag.getTag()); } @Override -- GitLab