Skip to content
Snippets Groups Projects
Commit 5d528fce authored by akwizgran's avatar akwizgran
Browse files

Merge branch '1112-screen-filter-crash' into 'master'

Don't show screen filter dialog after onSaveInstanceState()

Closes #1112

See merge request !642
parents c80edc99 b23c0b59
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment