Merge branch 'startup-fix' into 'master'

Show OpenDatabaseFragment right after signing in

See merge request briar/briar!1099
This commit is contained in:
akwizgran
2019-05-24 15:06:41 +00:00

View File

@@ -89,13 +89,9 @@ public class StartupActivity extends BaseActivity implements
if (!isFragmentAdded(PasswordFragment.TAG)) {
showInitialFragment(new PasswordFragment());
}
} else if (state == SIGNED_IN) {
} else if (state == SIGNED_IN || state == STARTING) {
startService(new Intent(this, BriarService.class));
} else if (state == STARTING) {
// Only show OpenDatabaseFragment if not already visible.
// This can happen because several LifecycleManager states are
// mapped to STARTING, so this can get called several times
// as the app's lifecycle advances.
if (!isFragmentAdded(OpenDatabaseFragment.TAG)) {
showNextFragment(new OpenDatabaseFragment());
}