mirror of https://github.com/M66B/FairEmail.git
Try to send message once only, report send errors
To prevent duplicates and endless retries
This commit is contained in:
parent
437ef94b6c
commit
fffb61b1cb
|
@ -839,7 +839,7 @@ public class ServiceSynchronize extends LifecycleService {
|
||||||
doDelete(folder, ifolder, message, jargs, db);
|
doDelete(folder, ifolder, message, jargs, db);
|
||||||
|
|
||||||
else if (EntityOperation.SEND.equals(op.name))
|
else if (EntityOperation.SEND.equals(op.name))
|
||||||
doSend(db, message);
|
doSend(isession, message, db);
|
||||||
|
|
||||||
else if (EntityOperation.ATTACHMENT.equals(op.name))
|
else if (EntityOperation.ATTACHMENT.equals(op.name))
|
||||||
doAttachment(folder, op, ifolder, message, jargs, db);
|
doAttachment(folder, op, ifolder, message, jargs, db);
|
||||||
|
@ -850,6 +850,10 @@ public class ServiceSynchronize extends LifecycleService {
|
||||||
// Operation succeeded
|
// Operation succeeded
|
||||||
db.operation().deleteOperation(op.id);
|
db.operation().deleteOperation(op.id);
|
||||||
} catch (Throwable ex) {
|
} catch (Throwable ex) {
|
||||||
|
// TODO: SMTP response codes: https://www.ietf.org/rfc/rfc821.txt
|
||||||
|
if (ex instanceof SMTPSendFailedException)
|
||||||
|
reportError(null, folder.name, ex);
|
||||||
|
|
||||||
db.message().setMessageError(message.id, Helper.formatThrowable(ex));
|
db.message().setMessageError(message.id, Helper.formatThrowable(ex));
|
||||||
|
|
||||||
if (BuildConfig.DEBUG && ex instanceof NullPointerException) {
|
if (BuildConfig.DEBUG && ex instanceof NullPointerException) {
|
||||||
|
@ -960,7 +964,7 @@ public class ServiceSynchronize extends LifecycleService {
|
||||||
db.message().deleteMessage(message.id);
|
db.message().deleteMessage(message.id);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void doSend(DB db, EntityMessage message) throws MessagingException {
|
private void doSend(Session isession, EntityMessage message, DB db) throws MessagingException {
|
||||||
// Send message
|
// Send message
|
||||||
EntityIdentity ident = db.identity().getIdentity(message.identity);
|
EntityIdentity ident = db.identity().getIdentity(message.identity);
|
||||||
EntityMessage reply = (message.replying == null ? null : db.message().getMessage(message.replying));
|
EntityMessage reply = (message.replying == null ? null : db.message().getMessage(message.replying));
|
||||||
|
@ -971,10 +975,6 @@ public class ServiceSynchronize extends LifecycleService {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create session
|
|
||||||
Properties props = MessageHelper.getSessionProperties();
|
|
||||||
Session isession = Session.getInstance(props, null);
|
|
||||||
|
|
||||||
// Create message
|
// Create message
|
||||||
MimeMessage imessage;
|
MimeMessage imessage;
|
||||||
if (reply == null)
|
if (reply == null)
|
||||||
|
@ -992,16 +992,10 @@ public class ServiceSynchronize extends LifecycleService {
|
||||||
itransport.connect(ident.host, ident.port, ident.user, ident.password);
|
itransport.connect(ident.host, ident.port, ident.user, ident.password);
|
||||||
|
|
||||||
// Send message
|
// Send message
|
||||||
try {
|
Address[] to = imessage.getAllRecipients();
|
||||||
Address[] to = imessage.getAllRecipients();
|
itransport.sendMessage(imessage, to);
|
||||||
itransport.sendMessage(imessage, to);
|
Log.i(Helper.TAG, "Sent via " + ident.host + "/" + ident.user +
|
||||||
Log.i(Helper.TAG, "Sent via " + ident.host + "/" + ident.user +
|
" to " + TextUtils.join(", ", to));
|
||||||
" to " + TextUtils.join(", ", to));
|
|
||||||
} catch (SMTPSendFailedException ex) {
|
|
||||||
// TODO: response codes: https://www.ietf.org/rfc/rfc821.txt
|
|
||||||
db.message().setMessageError(message.id, Helper.formatThrowable(ex));
|
|
||||||
throw ex;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
db.beginTransaction();
|
db.beginTransaction();
|
||||||
|
@ -1488,13 +1482,18 @@ public class ServiceSynchronize extends LifecycleService {
|
||||||
@Override
|
@Override
|
||||||
public void onReceive(Context context, Intent intent) {
|
public void onReceive(Context context, Intent intent) {
|
||||||
Log.i(Helper.TAG, outbox.name + " run operations");
|
Log.i(Helper.TAG, outbox.name + " run operations");
|
||||||
|
|
||||||
|
// Create session
|
||||||
|
Properties props = MessageHelper.getSessionProperties();
|
||||||
|
final Session isession = Session.getInstance(props, null);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
executor.submit(new Runnable() {
|
executor.submit(new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
try {
|
try {
|
||||||
Log.i(Helper.TAG, outbox.name + " start operations");
|
Log.i(Helper.TAG, outbox.name + " start operations");
|
||||||
processOperations(outbox, null, null, null);
|
processOperations(outbox, isession, null, null);
|
||||||
} catch (Throwable ex) {
|
} catch (Throwable ex) {
|
||||||
Log.e(Helper.TAG, outbox.name + " " + ex + "\n" + Log.getStackTraceString(ex));
|
Log.e(Helper.TAG, outbox.name + " " + ex + "\n" + Log.getStackTraceString(ex));
|
||||||
reportError(null, outbox.name, ex);
|
reportError(null, outbox.name, ex);
|
||||||
|
|
Loading…
Reference in New Issue