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

Explicitly send NOOP when polling

This commit is contained in:
M66B 2019-03-25 17:34:48 +00:00
parent 886e87198d
commit a8c4d0d3ce
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,9 +35,11 @@ import android.os.Build;
import android.os.Handler; import android.os.Handler;
import android.os.PowerManager; import android.os.PowerManager;
import com.sun.mail.iap.ProtocolException;
import com.sun.mail.imap.IMAPFolder; import com.sun.mail.imap.IMAPFolder;
import com.sun.mail.imap.IMAPMessage; import com.sun.mail.imap.IMAPMessage;
import com.sun.mail.imap.IMAPStore; import com.sun.mail.imap.IMAPStore;
import com.sun.mail.imap.protocol.IMAPProtocol;
import java.io.IOException; import java.io.IOException;
import java.text.DateFormat; import java.text.DateFormat;
@ -504,7 +506,7 @@ public class ServiceSynchronize extends LifecycleService {
final IMAPStore istore = (IMAPStore) isession.getStore(account.getProtocol()); final IMAPStore istore = (IMAPStore) isession.getStore(account.getProtocol());
final Map<EntityFolder, Folder> folders = new HashMap<>(); final Map<EntityFolder, IMAPFolder> folders = new HashMap<>();
List<Thread> idlers = new ArrayList<>(); List<Thread> idlers = new ArrayList<>();
List<TwoStateOwner> owners = new ArrayList<>(); List<TwoStateOwner> owners = new ArrayList<>();
try { try {
@ -636,7 +638,7 @@ public class ServiceSynchronize extends LifecycleService {
db.folder().setFolderState(folder.id, "connecting"); db.folder().setFolderState(folder.id, "connecting");
final Folder ifolder = istore.getFolder(folder.name); final IMAPFolder ifolder = (IMAPFolder) istore.getFolder(folder.name);
try { try {
ifolder.open(Folder.READ_WRITE); ifolder.open(Folder.READ_WRITE);
} catch (MessagingException ex) { } catch (MessagingException ex) {
@ -685,7 +687,7 @@ public class ServiceSynchronize extends LifecycleService {
message = Core.synchronizeMessage( message = Core.synchronizeMessage(
ServiceSynchronize.this, ServiceSynchronize.this,
account, folder, account, folder,
(IMAPFolder) ifolder, (IMAPMessage) imessage, ifolder, (IMAPMessage) imessage,
false, false,
db.rule().getEnabledRules(folder.id)); db.rule().getEnabledRules(folder.id));
db.setTransactionSuccessful(); db.setTransactionSuccessful();
@ -695,7 +697,7 @@ public class ServiceSynchronize extends LifecycleService {
if (db.folder().getFolderDownload(folder.id)) if (db.folder().getFolderDownload(folder.id))
Core.downloadMessage(ServiceSynchronize.this, Core.downloadMessage(ServiceSynchronize.this,
folder, (IMAPFolder) ifolder, folder, ifolder,
(IMAPMessage) imessage, message.id, state); (IMAPMessage) imessage, message.id, state);
} catch (MessageRemovedException ex) { } catch (MessageRemovedException ex) {
Log.w(folder.name, ex); Log.w(folder.name, ex);
@ -730,7 +732,7 @@ public class ServiceSynchronize extends LifecycleService {
Log.i(folder.name + " messages removed"); Log.i(folder.name + " messages removed");
for (Message imessage : e.getMessages()) for (Message imessage : e.getMessages())
try { try {
long uid = ((IMAPFolder) ifolder).getUID(imessage); long uid = ifolder.getUID(imessage);
DB db = DB.getInstance(ServiceSynchronize.this); DB db = DB.getInstance(ServiceSynchronize.this);
int count = db.message().deleteMessage(folder.id, uid); int count = db.message().deleteMessage(folder.id, uid);
@ -775,7 +777,7 @@ public class ServiceSynchronize extends LifecycleService {
message = Core.synchronizeMessage( message = Core.synchronizeMessage(
ServiceSynchronize.this, ServiceSynchronize.this,
account, folder, account, folder,
(IMAPFolder) ifolder, (IMAPMessage) e.getMessage(), ifolder, (IMAPMessage) e.getMessage(),
false, false,
db.rule().getEnabledRules(folder.id)); db.rule().getEnabledRules(folder.id));
db.setTransactionSuccessful(); db.setTransactionSuccessful();
@ -785,7 +787,7 @@ public class ServiceSynchronize extends LifecycleService {
if (db.folder().getFolderDownload(folder.id)) if (db.folder().getFolderDownload(folder.id))
Core.downloadMessage(ServiceSynchronize.this, Core.downloadMessage(ServiceSynchronize.this,
folder, (IMAPFolder) ifolder, folder, ifolder,
(IMAPMessage) e.getMessage(), message.id, state); (IMAPMessage) e.getMessage(), message.id, state);
} catch (MessageRemovedException ex) { } catch (MessageRemovedException ex) {
Log.w(folder.name, ex); Log.w(folder.name, ex);
@ -819,7 +821,7 @@ public class ServiceSynchronize extends LifecycleService {
Log.i(folder.name + " start idle"); Log.i(folder.name + " start idle");
while (state.running()) { while (state.running()) {
Log.i(folder.name + " do idle"); Log.i(folder.name + " do idle");
((IMAPFolder) ifolder).idle(false); ifolder.idle(false);
} }
} catch (Throwable ex) { } catch (Throwable ex) {
Log.e(folder.name, ex); Log.e(folder.name, ex);
@ -952,16 +954,25 @@ public class ServiceSynchronize extends LifecycleService {
AlarmManager am = (AlarmManager) getSystemService(Context.ALARM_SERVICE); AlarmManager am = (AlarmManager) getSystemService(Context.ALARM_SERVICE);
try { try {
while (state.running()) { while (state.running()) {
if (!istore.isConnected()) if (!istore.isConnected()) // Sends store NOOP
throw new StoreClosedException(istore); throw new StoreClosedException(istore);
for (EntityFolder folder : folders.keySet()) for (EntityFolder folder : folders.keySet())
if (folder.synchronize) if (folder.synchronize)
if (!folder.poll && capIdle) { if (!folder.poll && capIdle) {
if (!folders.get(folder).isOpen()) if (!folders.get(folder).isOpen()) // Sends folder NOOP
throw new FolderClosedException(folders.get(folder)); throw new FolderClosedException(folders.get(folder));
} else } else {
folders.get(folder).doCommand(new IMAPFolder.ProtocolCommand() {
@Override
public Object doCommand(IMAPProtocol protocol) throws ProtocolException {
protocol.noop();
return null;
}
});
EntityOperation.sync(this, folder.id, false); EntityOperation.sync(this, folder.id, false);
}
// Successfully connected: reset back off time // Successfully connected: reset back off time
backoff = CONNECT_BACKOFF_START; backoff = CONNECT_BACKOFF_START;