From cf957d763ee2cb19a4067a15b512bf65c2bf5a9b Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 21 Sep 2018 17:36:19 +0000 Subject: [PATCH] Prevent crash --- .../eu/faircode/email/FragmentAccount.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java index e551ca93..283466d0 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAccount.java +++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java @@ -115,6 +115,7 @@ public class FragmentAccount extends FragmentEx { private ProgressBar pbCheck; + private ArrayAdapter adapter; private Spinner spDrafts; private Spinner spSent; private Spinner spAll; @@ -789,6 +790,15 @@ public class FragmentAccount extends FragmentEx { } }); + adapter = new ArrayAdapter<>(getContext(), R.layout.spinner_item, new ArrayList()); + adapter.setDropDownViewResource(R.layout.spinner_dropdown_item); + + spDrafts.setAdapter(adapter); + spSent.setAdapter(adapter); + spAll.setAdapter(adapter); + spTrash.setAdapter(adapter); + spJunk.setAdapter(adapter); + // Initialize Helper.setViewsEnabled(view, false); btnAuthorize.setVisibility(View.GONE); @@ -1044,14 +1054,8 @@ public class FragmentAccount extends FragmentEx { none.name = ""; folders.add(0, none); - ArrayAdapter adapter = new ArrayAdapter<>(getContext(), R.layout.spinner_item, folders); - adapter.setDropDownViewResource(R.layout.spinner_dropdown_item); - - spDrafts.setAdapter(adapter); - spSent.setAdapter(adapter); - spAll.setAdapter(adapter); - spTrash.setAdapter(adapter); - spJunk.setAdapter(adapter); + adapter.clear(); + adapter.addAll(folders); for (int pos = 0; pos < folders.size(); pos++) { if (EntityFolder.DRAFTS.equals(folders.get(pos).type))