mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Handle providers without drafts folder 

for example free.fr
This commit is contained in:
M66B 2018-08-03 14:41:31 +00:00
parent 8ac235791f
commit d32df01e25
3 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -243,8 +243,14 @@ public class FragmentAccount extends Fragment {
} }
} }
} }
if (account.primary && !drafts) if (!drafts) {
throw new MessagingException(getContext().getString(R.string.title_no_drafts)); EntityFolder folder = new EntityFolder();
folder.name = getContext().getString(R.string.title_local_drafts);
folder.type = EntityFolder.TYPE_DRAFTS;
folder.synchronize = false;
folder.after = 0;
folders.add(folder);
}
} finally { } finally {
if (istore != null) if (istore != null)
istore.close(); istore.close();
@ -254,30 +260,31 @@ public class FragmentAccount extends Fragment {
if (account.primary) if (account.primary)
db.account().resetPrimary(); db.account().resetPrimary();
if (update) try {
db.account().updateAccount(account); db.beginTransaction();
else if (update)
try { db.account().updateAccount(account);
db.beginTransaction(); else
account.id = db.account().insertAccount(account); account.id = db.account().insertAccount(account);
EntityFolder inbox = new EntityFolder(); EntityFolder inbox = new EntityFolder();
inbox.name = "INBOX"; inbox.name = "INBOX";
inbox.type = EntityFolder.TYPE_INBOX; inbox.type = EntityFolder.TYPE_INBOX;
inbox.synchronize = true; inbox.synchronize = true;
inbox.after = DEFAULT_INBOX_SYNC; inbox.after = DEFAULT_INBOX_SYNC;
folders.add(0, inbox); folders.add(0, inbox);
for (EntityFolder folder : folders) { for (EntityFolder folder : folders)
if (db.folder().getFolder(account.id, folder.name) == null) {
folder.account = account.id; folder.account = account.id;
Log.i(Helper.TAG, "Creating folder=" + folder.name + " (" + folder.type + ")"); Log.i(Helper.TAG, "Creating folder=" + folder.name + " (" + folder.type + ")");
folder.id = db.folder().insertFolder(folder); folder.id = db.folder().insertFolder(folder);
} }
db.setTransactionSuccessful(); db.setTransactionSuccessful();
} finally { } finally {
db.endTransaction(); db.endTransaction();
} }
ServiceSynchronize.restart(getContext(), "account"); ServiceSynchronize.restart(getContext(), "account");

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

@ -64,6 +64,7 @@ import javax.mail.FetchProfile;
import javax.mail.Flags; import javax.mail.Flags;
import javax.mail.Folder; import javax.mail.Folder;
import javax.mail.FolderClosedException; import javax.mail.FolderClosedException;
import javax.mail.FolderNotFoundException;
import javax.mail.Message; import javax.mail.Message;
import javax.mail.MessageRemovedException; import javax.mail.MessageRemovedException;
import javax.mail.MessagingException; import javax.mail.MessagingException;
@ -549,6 +550,10 @@ public class ServiceSynchronize extends LifecycleService {
lbm.unregisterReceiver(receiver); lbm.unregisterReceiver(receiver);
Log.i(Helper.TAG, folder.name + " unlisten process id=" + folder.id); Log.i(Helper.TAG, folder.name + " unlisten process id=" + folder.id);
} }
} catch (FolderNotFoundException ex) {
Log.w(Helper.TAG, folder.name + " " + ex + "\n" + Log.getStackTraceString(ex));
folder.synchronize = false;
DB.getInstance(this).folder().updateFolder(folder);
} finally { } finally {
if (ifolder != null && ifolder.isOpen()) { if (ifolder != null && ifolder.isOpen()) {
try { try {
@ -584,6 +589,12 @@ public class ServiceSynchronize extends LifecycleService {
imessage.setFlag(Flags.Flag.SEEN, jargs.getBoolean(0)); imessage.setFlag(Flags.Flag.SEEN, jargs.getBoolean(0));
} else if (EntityOperation.ADD.equals(op.name)) { } else if (EntityOperation.ADD.equals(op.name)) {
if (!folder.synchronize) {
// Local drafts
Log.w(Helper.TAG, "Folder synchronization disabled");
return;
}
// Append message // Append message
EntityMessage msg = message.getMessage(op.message); EntityMessage msg = message.getMessage(op.message);
Properties props = MessageHelper.getSessionProperties(); Properties props = MessageHelper.getSessionProperties();

2
app/src/main/res/values/strings.xml
View File

@ -59,7 +59,7 @@
<string name="title_no_name">Name mandatory</string> <string name="title_no_name">Name mandatory</string>
<string name="title_no_email">Email address mandatory</string> <string name="title_no_email">Email address mandatory</string>
<string name="title_no_idle">IDLE not supported</string> <string name="title_no_idle">IDLE not supported</string>
<string name="title_no_drafts">No drafts folder</string> <string name="title_local_drafts">Local drafts</string>
<string name="title_folder_unseen">%1$s (%2$d)</string> <string name="title_folder_unseen">%1$s (%2$d)</string>
<string name="title_synchronize_folder">Synchronize (receive messages)</string> <string name="title_synchronize_folder">Synchronize (receive messages)</string>