From 6ce4ddb4741cd622db0fbe51a045e26f9c3fc0db Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 30 Sep 2021 11:35:38 +0200 Subject: [PATCH] Always list personal root namespace --- app/src/main/java/eu/faircode/email/Core.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index 51e2d8a741..1f942af074 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -2031,14 +2031,24 @@ class Core { List> ifolders = new ArrayList<>(); List subscription = new ArrayList<>(); - Folder[] personal; + List personal = new ArrayList<>(); try { - personal = istore.getPersonalNamespaces(); - if (personal.length == 0) - throw new MessagingException("Empty personal namespaces"); + Folder[] pnamespaces = istore.getPersonalNamespaces(); + + boolean root = false; + Folder d = istore.getDefaultFolder(); + if (pnamespaces != null) { + personal.addAll(Arrays.asList(pnamespaces)); + for (Folder p : pnamespaces) + if (d.getFullName().equals(p.getFullName())) { + root = true; + break; + } + } + if (!root) + personal.add(d); } catch (MessagingException ex) { Log.e(ex); - personal = new Folder[]{istore.getDefaultFolder()}; } for (Folder namespace : personal) {