mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-01 12:44:42 +00:00
Code Issues Releases Wiki Activity

Improved send logic

Browse source
This commit is contained in:
M66B 2020-06-26 10:59:32 +02:00
parent d063ead7ee
commit 6867f9ab6b
3 changed files with 58 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/eu/faircode/email/DaoOperation.java
View file

@ -145,4 +145,7 @@ public interface DaoOperation {
@Query("DELETE FROM operation WHERE id = :id")
int deleteOperation(long id);
@Query("DELETE FROM operation WHERE folder = :folder")
int deleteOperations(long folder);
}

5
app/src/main/java/eu/faircode/email/EntityOperation.java
View file

@ -482,4 +482,9 @@ public class EntityOperation {
} else
return false;
}
@Override
public String toString() {
return Long.toString(id);
}
}

117
app/src/main/java/eu/faircode/email/ServiceSend.java
View file

@ -69,12 +69,11 @@ public class ServiceSend extends ServiceBase {
private PowerManager.WakeLock wlOutbox;
private TwoStateOwner owner = new TwoStateOwner("send");
private List<Long> handling = new ArrayList<>();
private static ExecutorService executor = Helper.getBackgroundExecutor(1, "send");
private static final int PI_SEND = 1;
private static final long CONNECTIVITY_DELAY = 5000L; // milliseconds
private static final int IDENTITY_ERROR_AFTER = 30; // minutes
private static final int RETRY_MAX = 3;
@Override
@ -106,33 +105,42 @@ public class ServiceSend extends ServiceBase {
// Observe send operations
db.operation().liveOperations(null).observe(owner, new Observer<List<TupleOperationEx>>() {
private List<Long> handling = new ArrayList<>();
@Override
public void onChanged(final List<TupleOperationEx> operations) {
boolean process = false;
public void onChanged(List<TupleOperationEx> operations) {
if (operations == null)
operations = new ArrayList<>();
if (operations.size() == 0)
stopSelf();
final List<TupleOperationEx> process = new ArrayList<>();
List<Long> ops = new ArrayList<>();
for (EntityOperation op : operations) {
for (TupleOperationEx op : operations) {
if (!handling.contains(op.id))
process = true;
process.add(op);
ops.add(op.id);
}
handling = ops;
if (process) {
Log.i("OUTBOX operations=" + operations.size());
if (process.size() > 0) {
Log.i("OUTBOX process=" + TextUtils.join(",", process) +
" handling=" + TextUtils.join(",", handling));
executor.submit(new Runnable() {
@Override
public void run() {
processOperations();
processOperations(process);
}
});
}
}
});
lastSuitable = ConnectionHelper.getNetworkState(this).isSuitable();
if (lastSuitable)
owner.start();
ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkRequest.Builder builder = new NetworkRequest.Builder();
builder.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
@ -153,6 +161,9 @@ public class ServiceSend extends ServiceBase {
ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
cm.unregisterNetworkCallback(networkCallback);
owner.stop();
handling.clear();
stopForeground(true);
NotificationManager nm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
@ -252,36 +263,29 @@ public class ServiceSend extends ServiceBase {
if (suitable)
owner.start();
else
else {
owner.stop();
handling.clear();
}
}
if (suitable)
executor.submit(new Runnable() {
@Override
public void run() {
processOperations();
}
});
}
private void processOperations() {
private void processOperations(List<TupleOperationEx> ops) {
try {
wlOutbox.acquire();
if (!ConnectionHelper.getNetworkState(this).isSuitable())
return;
DB db = DB.getInstance(this);
EntityFolder outbox = db.folder().getOutbox();
try {
db.folder().setFolderError(outbox.id, null);
db.folder().setFolderSyncState(outbox.id, "syncing");
List<TupleOperationEx> ops = db.operation().getOperations(outbox.id);
Log.i(outbox.name + " pending operations=" + ops.size());
Log.i(outbox.name + " processing operations=" + ops.size());
while (ops.size() > 0) {
if (!ConnectionHelper.getNetworkState(this).isSuitable())
break;
TupleOperationEx op = ops.get(0);
EntityMessage message = null;
@ -292,6 +296,7 @@ public class ServiceSend extends ServiceBase {
Log.i(outbox.name +
" start op=" + op.id + "/" + op.name +
" msg=" + op.message +
" tries=" + op.tries +
" args=" + op.args);
db.operation().setOperationTries(op.id, ++op.tries);
@ -364,41 +369,14 @@ public class ServiceSend extends ServiceBase {
}
continue;
} else {
if (message != null) {
String title = MessageHelper.formatAddresses(message.to);
PendingIntent pi = getPendingIntent(this);
EntityLog.log(this, title + " last attempt: " + new Date(message.last_attempt));
long now = new Date().getTime();
long delayed = now - message.last_attempt;
if (delayed > IDENTITY_ERROR_AFTER * 60 * 1000L) {
Log.i("Reporting send error after=" + delayed);
try {
NotificationManager nm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
nm.notify("send:" + message.id, 1,
Core.getNotificationError(this, "warning", title, ex, pi).build());
} catch (Throwable ex1) {
Log.w(ex1);
}
}
}
} else
throw ex;
}
} finally {
Log.i(outbox.name + " end op=" + op.id + "/" + op.name);
db.operation().setOperationState(op.id, null);
}
if (!ConnectionHelper.getNetworkState(this).isSuitable())
break;
}
if (db.operation().getOperations(outbox.id).size() == 0)
stopSelf();
} catch (Throwable ex) {
Log.e(outbox.name, ex);
db.folder().setFolderError(outbox.id, Log.formatThrowable(ex));
@ -414,20 +392,27 @@ public class ServiceSend extends ServiceBase {
private void onSync(EntityFolder outbox) {
DB db = DB.getInstance(this);
db.folder().setFolderError(outbox.id, null);
try {
db.beginTransaction();
// Restore snooze timers
for (EntityMessage message : db.message().getSnoozed(outbox.id))
EntityMessage.snooze(this, message.id, message.ui_snoozed);
db.folder().setFolderError(outbox.id, null);
// Retry failed message
for (long id : db.message().getMessageByFolder(outbox.id)) {
int ops = db.operation().getOperationCount(outbox.id, id, EntityOperation.SEND);
if (ops == 0) {
// Delete pending operations
db.operation().deleteOperations(outbox.id);
// Requeue operations
for (long id : db.message().getMessageByFolder(outbox.id)) {
EntityMessage message = db.message().getMessage(id);
if (message != null && message.ui_snoozed == null)
EntityOperation.queue(this, message, EntityOperation.SEND);
if (message != null)
if (message.ui_snoozed == null)
EntityOperation.queue(this, message, EntityOperation.SEND);
else
EntityMessage.snooze(this, message.id, message.ui_snoozed);
}
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
}
@ -558,8 +543,6 @@ public class ServiceSend extends ServiceBase {
// Send message
EntityLog.log(this, "Sending " + via);
if (BuildConfig.DEBUG && false)
throw new SendFailedException("Test");
iservice.getTransport().sendMessage(imessage, to);
long time = new Date().getTime();
EntityLog.log(this, "Sent " + via);