Prevent crash

6 years ago · 1a02eac88d
parent 754d28ea13
commit 1a02eac88d
1 changed files with 5 additions and 3 deletions
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@ -210,9 +210,11 @@ public class FragmentMessages extends FragmentEx {
                            db.beginTransaction();

                            List<EntityFolder> folders = new ArrayList<>();
-                            if (fid < 0)
-                                folders.addAll(db.folder().getFoldersSynchronizingUnified());
-                            else {
+                            if (fid < 0) {
+                                List<EntityFolder> unified = db.folder().getFoldersSynchronizingUnified();
+                                if (unified != null)
+                                    folders.addAll(unified);
+                            } else {
                                EntityFolder folder = db.folder().getFolder(fid);
                                if (folder != null)
                                    folders.add(folder);