From c692777d66c5c88a536a0c65e742043c483b1900 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 4 Sep 2018 12:32:23 +0000 Subject: [PATCH] Setup accounts before setting up identities Fixes #73 --- app/src/main/java/eu/faircode/email/ActivitySetup.java | 2 +- app/src/main/java/eu/faircode/email/FragmentSetup.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java index 5f41476c..6b70321b 100644 --- a/app/src/main/java/eu/faircode/email/ActivitySetup.java +++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java @@ -35,7 +35,7 @@ import androidx.lifecycle.Observer; import androidx.localbroadcastmanager.content.LocalBroadcastManager; public class ActivitySetup extends ActivityBase implements FragmentManager.OnBackStackChangedListener { - boolean hasAccount; + private boolean hasAccount; static final int REQUEST_PERMISSION = 1; static final int REQUEST_CHOOSE_ACCOUNT = 2; diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java index 9ca91196..4c2590b7 100644 --- a/app/src/main/java/eu/faircode/email/FragmentSetup.java +++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java @@ -144,6 +144,7 @@ public class FragmentSetup extends FragmentEx { pbAccount.setVisibility(View.GONE); pbIdentity.setVisibility(View.GONE); tvAccountDone.setText(R.string.title_setup_to_do); + btnIdentity.setEnabled(false); tvIdentityDone.setText(R.string.title_setup_to_do); tvPermissionsDone.setText(R.string.title_setup_to_do); @@ -198,6 +199,7 @@ public class FragmentSetup extends FragmentEx { @Override public void onChanged(@Nullable List accounts) { tvAccountDone.setText(accounts != null && accounts.size() > 0 ? R.string.title_setup_done : R.string.title_setup_to_do); + btnIdentity.setEnabled(accounts != null && accounts.size() > 0); } });