Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-14 13:03:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Retry EXISTS after 20 seconds

Browse Source
This commit is contained in:
M66B
2021-02-22 20:11:34 +01:00
parent 3fa597579d
commit d4c6648959
3 changed files with 51 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/eu/faircode/email/Core.java
View File

@@ -19,6 +19,7 @@ package eu.faircode.email;
Copyright 2018-2021 by Marcel Bokhorst (M66B)
*/
import android.app.AlarmManager;
import android.app.Notification;
import android.app.NotificationChannel;
import android.app.NotificationManager;
@@ -39,6 +40,7 @@ import android.util.Pair;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.app.AlarmManagerCompat;
import androidx.core.app.NotificationCompat;
import androidx.core.app.Person;
import androidx.core.app.RemoteInput;
@@ -152,6 +154,7 @@ class Core {
private static final long LOCAL_RETRY_DELAY = 5 * 1000L; // milliseconds
private static final int TOTAL_RETRY_MAX = LOCAL_RETRY_MAX * 5;
private static final int MAX_PREVIEW = 5000; // characters
private static final long EXISTS_RETRY_DELAY = 20 * 1000L; // milliseconds
static void processOperations(
Context context,
@@ -397,7 +400,7 @@ class Core {
break;
case EntityOperation.EXISTS:
onExists(context, jargs, folder, message, op, (IMAPFolder) ifolder);
onExists(context, jargs, account, folder, message, op, (IMAPFolder) ifolder);
break;
case EntityOperation.SYNC:
@@ -1634,13 +1637,16 @@ class Core {
EntityLog.log(context, "Operation attachment size=" + attachment.size);
}
private static void onExists(Context context, JSONArray jargs, EntityFolder folder, EntityMessage message, EntityOperation op, IMAPFolder ifolder) throws MessagingException, IOException {
private static void onExists(Context context, JSONArray jargs, EntityAccount account, EntityFolder folder, EntityMessage message, EntityOperation op, IMAPFolder ifolder) throws MessagingException, IOException {
boolean retry = jargs.optBoolean(0);
if (message.uid != null)
return;
if (message.msgid == null)
throw new IllegalArgumentException("exists without msgid");
// Search for message
Message[] imessages = ifolder.search(new MessageIDTerm(message.msgid));
if (imessages == null || imessages.length == 0)
try {
@@ -1654,6 +1660,24 @@ class Core {
// Seznam: Jakarta Mail Exception: java.io.IOException: Connection dropped by server?
}
// Some email servers are slow with adding sent messages
if (retry)
Log.w(folder.name + " EXISTS retry" +
" found=" + (imessages == null ? null : imessages.length) +
" host=" + account.host);
else if (imessages == null || imessages.length == 0) {
long next = new Date().getTime() + EXISTS_RETRY_DELAY;
Intent intent = new Intent(context, ServiceUI.class);
intent.setAction("exists:" + message.id);
PendingIntent piExists = PendingIntent.getService(
context, ServiceUI.PI_EXISTS, intent, PendingIntent.FLAG_UPDATE_CURRENT);
AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
AlarmManagerCompat.setAndAllowWhileIdle(am, AlarmManager.RTC_WAKEUP, next, piExists);
return;
}
if (imessages != null && imessages.length == 1) {
String msgid;
try {
@@ -1671,7 +1695,7 @@ class Core {
}
} else {
if (imessages != null && imessages.length > 1)
Log.e(folder.name + " EXISTS messages=" + imessages.length);
Log.e(folder.name + " EXISTS messages=" + imessages.length + " retry=" + retry);
EntityLog.log(context, folder.name + " EXISTS messages=" + imessages.length);
EntityOperation.queue(context, message, EntityOperation.ADD);
}

8
app/src/main/java/eu/faircode/email/ServiceSend.java
View File

@@ -78,7 +78,6 @@ public class ServiceSend extends ServiceBase implements SharedPreferences.OnShar
private static final int PI_SEND = 1;
private static final int RETRY_MAX = 3;
private static final int CONNECTIVITY_DELAY = 5000; // milliseconds
private static final long EXISTS_DELAY = 20 * 1000L; // milliseconds
@Override
public void onCreate() {
@@ -706,13 +705,6 @@ public class ServiceSend extends ServiceBase implements SharedPreferences.OnShar
// Check sent message
if (sid != null) {
try {
// Some email servers are slow with adding sent messages
Thread.sleep(EXISTS_DELAY);
} catch (InterruptedException ex) {
Log.e(ex);
}
try {
db.beginTransaction();

24
app/src/main/java/eu/faircode/email/ServiceUI.java
View File

@@ -63,6 +63,7 @@ public class ServiceUI extends IntentService {
static final int PI_WAKEUP = 12;
static final int PI_SYNC = 13;
static final int PI_BANNER = 14;
static final int PI_EXISTS = 15;
static final int HIDE_BANNER = 3; // weeks
@@ -170,6 +171,10 @@ public class ServiceUI extends IntentService {
onSync(id, reschedule);
break;
case "exists":
onExists(id);
break;
case "daily":
case "banner":
onBanner();
@@ -555,6 +560,25 @@ public class ServiceUI extends IntentService {
}
}
private void onExists(long id) {
DB db = DB.getInstance(this);
try {
db.beginTransaction();
// Message could have been deleted in the meantime
EntityMessage message = db.message().getMessage(id);
if (message == null)
return;
EntityOperation.queue(this, message, EntityOperation.EXISTS, true);
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
}
private void onBanner() {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
prefs.edit().remove("banner_hidden").apply();