msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Refactoring

Browse Source
pull/147/head
M66B 7 years ago
parent 60ad445c6a
commit 8bef85df9e
4 changed files with 40 additions and 59 deletions
Show Stats Download Patch File Download Diff File

23
app/src/main/java/eu/faircode/email/EntityFolder.java
Unescape View File

@ -105,7 +105,7 @@ public class EntityFolder implements Serializable {
static final String USER = "User"; static final String USER = "User";
// https://www.iana.org/assignments/imap-mailbox-name-attributes/imap-mailbox-name-attributes.xhtml // https://www.iana.org/assignments/imap-mailbox-name-attributes/imap-mailbox-name-attributes.xhtml
static final List<String> SYSTEM_FOLDER_ATTR = Arrays.asList( private static final List<String> SYSTEM_FOLDER_ATTR = Arrays.asList(
"All", "All",
"Archive", "Archive",
"Drafts", "Drafts",
@ -115,7 +115,7 @@ public class EntityFolder implements Serializable {
"Important", "Important",
"Flagged" "Flagged"
); );
static final List<String> SYSTEM_FOLDER_TYPE = Arrays.asList( private static final List<String> SYSTEM_FOLDER_TYPE = Arrays.asList(
ARCHIVE, ARCHIVE,
ARCHIVE, ARCHIVE,
DRAFTS, DRAFTS,
@ -184,6 +184,25 @@ public class EntityFolder implements Serializable {
return DRAFTS.equals(type) || OUTBOX.equals(type) || SENT.equals(type); return DRAFTS.equals(type) || OUTBOX.equals(type) || SENT.equals(type);
} }
static String getType(String[] attrs, String fullName) {
for (String attr : attrs) {
if ("\\Noselect".equals(attr) || "\\NonExistent".equals(attr))
return null;
if (attr.startsWith("\\")) {
int index = SYSTEM_FOLDER_ATTR.indexOf(attr.substring(1));
if (index >= 0)
return SYSTEM_FOLDER_TYPE.get(index);
}
}
// https://tools.ietf.org/html/rfc3501#section-5.1
if ("INBOX".equals(fullName.toUpperCase()))
return INBOX;
return USER;
}
static int getLevel(Character separator, String name) { static int getLevel(Character separator, String name) {
int level = 0; int level = 0;
if (separator != null) { if (separator != null) {

27
app/src/main/java/eu/faircode/email/FragmentAccount.java
Unescape View File

@ -582,30 +582,19 @@ public class FragmentAccount extends FragmentBase {
for (Folder ifolder : istore.getDefaultFolder().list("*")) { for (Folder ifolder : istore.getDefaultFolder().list("*")) {
// Check folder attributes // Check folder attributes
String type = null; String fullName = ifolder.getFullName();
boolean selectable = true;
String[] attrs = ((IMAPFolder) ifolder).getAttributes(); String[] attrs = ((IMAPFolder) ifolder).getAttributes();
Log.i(ifolder.getFullName() + " attrs=" + TextUtils.join(" ", attrs)); Log.i(fullName + " attrs=" + TextUtils.join(" ", attrs));
for (String attr : attrs) { String type = EntityFolder.getType(attrs, fullName);
if ("\\Noselect".equals(attr) || "\\NonExistent".equals(attr))
selectable = false;
if (attr.startsWith("\\")) {
int index = EntityFolder.SYSTEM_FOLDER_ATTR.indexOf(attr.substring(1));
if (index >= 0) {
type = EntityFolder.SYSTEM_FOLDER_TYPE.get(index);
break;
}
}
}
if (selectable) { if (type != null) {
// Create entry // Create entry
EntityFolder folder = db.folder().getFolderByName(id, ifolder.getFullName()); EntityFolder folder = db.folder().getFolderByName(id, fullName);
if (folder == null) { if (folder == null) {
int sync = EntityFolder.SYSTEM_FOLDER_SYNC.indexOf(type); int sync = EntityFolder.SYSTEM_FOLDER_SYNC.indexOf(type);
folder = new EntityFolder(); folder = new EntityFolder();
folder.name = ifolder.getFullName(); folder.name = fullName;
folder.type = (type == null ? EntityFolder.USER : type); folder.type = type;
folder.synchronize = (sync >= 0); folder.synchronize = (sync >= 0);
folder.download = (sync < 0 ? true : EntityFolder.SYSTEM_FOLDER_DOWNLOAD.get(sync)); folder.download = (sync < 0 ? true : EntityFolder.SYSTEM_FOLDER_DOWNLOAD.get(sync));
folder.sync_days = EntityFolder.DEFAULT_SYNC; folder.sync_days = EntityFolder.DEFAULT_SYNC;
@ -613,7 +602,7 @@ public class FragmentAccount extends FragmentBase {
} }
result.folders.add(folder); result.folders.add(folder);
if (type == null) { if (EntityFolder.USER.equals(type)) {
if (folder.name.toLowerCase().contains("archive")) if (folder.name.toLowerCase().contains("archive"))
altArchive = folder; altArchive = folder;
if (folder.name.toLowerCase().contains("draft")) if (folder.name.toLowerCase().contains("draft"))

22
app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
Unescape View File

@ -226,26 +226,16 @@ public class FragmentQuickSetup extends FragmentBase {
boolean drafts = false; boolean drafts = false;
for (Folder ifolder : istore.getDefaultFolder().list("*")) { for (Folder ifolder : istore.getDefaultFolder().list("*")) {
String type = null; String fullName = ifolder.getFullName();
boolean selectable = true;
String[] attrs = ((IMAPFolder) ifolder).getAttributes(); String[] attrs = ((IMAPFolder) ifolder).getAttributes();
Log.i(ifolder.getFullName() + " attrs=" + TextUtils.join(" ", attrs)); String type = EntityFolder.getType(attrs, fullName);
for (String attr : attrs) {
if ("\\Noselect".equals(attr) || "\\NonExistent".equals(attr)) Log.i(fullName + " attrs=" + TextUtils.join(" ", attrs) + " type=" + type);
selectable = false;
if (attr.startsWith("\\")) {
int index = EntityFolder.SYSTEM_FOLDER_ATTR.indexOf(attr.substring(1));
if (index >= 0) {
type = EntityFolder.SYSTEM_FOLDER_TYPE.get(index);
break;
}
}
}
if (selectable && type != null) { if (type != null) {
int sync = EntityFolder.SYSTEM_FOLDER_SYNC.indexOf(type); int sync = EntityFolder.SYSTEM_FOLDER_SYNC.indexOf(type);
EntityFolder folder = new EntityFolder(); EntityFolder folder = new EntityFolder();
folder.name = ifolder.getFullName(); folder.name = fullName;
folder.type = type; folder.type = type;
folder.level = EntityFolder.getLevel(separator, folder.name); folder.level = EntityFolder.getLevel(separator, folder.name);
folder.synchronize = (sync >= 0); folder.synchronize = (sync >= 0);

27
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
Unescape View File

@ -2195,30 +2195,13 @@ public class ServiceSynchronize extends LifecycleService {
for (Folder ifolder : ifolders) { for (Folder ifolder : ifolders) {
String fullName = ifolder.getFullName(); String fullName = ifolder.getFullName();
String type = null;
boolean selectable = true;
String[] attrs = ((IMAPFolder) ifolder).getAttributes(); String[] attrs = ((IMAPFolder) ifolder).getAttributes();
EntityLog.log(this, account.name + ":" + fullName + String type = EntityFolder.getType(attrs, fullName);
" attrs=" + TextUtils.join(" ", attrs));
for (String attr : attrs) {
if ("\\Noselect".equals(attr) || "\\NonExistent".equals(attr))
selectable = false;
if (attr.startsWith("\\")) {
int index = EntityFolder.SYSTEM_FOLDER_ATTR.indexOf(attr.substring(1));
if (index >= 0) {
type = EntityFolder.SYSTEM_FOLDER_TYPE.get(index);
break;
}
}
}
// https://tools.ietf.org/html/rfc3501#section-5.1 EntityLog.log(this, account.name + ":" + fullName +
if ("INBOX".equals(fullName.toUpperCase())) " attrs=" + TextUtils.join(" ", attrs) + " type=" + type);
type = EntityFolder.INBOX;
if (selectable) { if (type != null) {
names.remove(fullName); names.remove(fullName);
int level = EntityFolder.getLevel(separator, fullName); int level = EntityFolder.getLevel(separator, fullName);
@ -2232,7 +2215,7 @@ public class ServiceSynchronize extends LifecycleService {
folder.account = account.id; folder.account = account.id;
folder.name = fullName; folder.name = fullName;
folder.display = display; folder.display = display;
folder.type = (type == null ? EntityFolder.USER : type); folder.type = EntityFolder.USER;
folder.level = level; folder.level = level;
folder.synchronize = false; folder.synchronize = false;
folder.poll = ("imap.gmail.com".equals(account.host)); folder.poll = ("imap.gmail.com".equals(account.host));

Write Preview
Loading…
Cancel
Save