wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename RemoteMessageStore to Backend

Browse source
This commit is contained in:
cketti 2018-06-02 18:34:40 +02:00
parent 8499a95f5a
commit 03a54b0d98
3 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backend/api/src/main/java/com/fsck/k9/backend/api/RemoteMessageStore.java → backend/api/src/main/java/com/fsck/k9/backend/api/Backend.java
View file

@ -4,7 +4,7 @@ package com.fsck.k9.backend.api;
import com.fsck.k9.mail.Folder; import com.fsck.k9.mail.Folder;
public interface RemoteMessageStore { public interface Backend {
// TODO: Add a way to cancel the sync process // TODO: Add a way to cancel the sync process
void sync(String folder, SyncConfig syncConfig, SyncListener listener, Folder providedRemoteFolder); void sync(String folder, SyncConfig syncConfig, SyncListener listener, Folder providedRemoteFolder);
} }

6
backend/imap/src/main/java/com/fsck/k9/backend/imap/ImapMessageStore.java → backend/imap/src/main/java/com/fsck/k9/backend/imap/ImapBackend.java
View file

@ -1,19 +1,19 @@
package com.fsck.k9.backend.imap; package com.fsck.k9.backend.imap;
import com.fsck.k9.backend.api.Backend;
import com.fsck.k9.backend.api.BackendStorage; import com.fsck.k9.backend.api.BackendStorage;
import com.fsck.k9.backend.api.RemoteMessageStore;
import com.fsck.k9.backend.api.SyncConfig; import com.fsck.k9.backend.api.SyncConfig;
import com.fsck.k9.backend.api.SyncListener; import com.fsck.k9.backend.api.SyncListener;
import com.fsck.k9.mail.Folder; import com.fsck.k9.mail.Folder;
import com.fsck.k9.mail.store.imap.ImapStore; import com.fsck.k9.mail.store.imap.ImapStore;
public class ImapMessageStore implements RemoteMessageStore { public class ImapBackend implements Backend {
private final ImapSync imapSync; private final ImapSync imapSync;
public ImapMessageStore(String accountName, BackendStorage backendStorage, ImapStore imapStore) { public ImapBackend(String accountName, BackendStorage backendStorage, ImapStore imapStore) {
this.imapSync = new ImapSync(accountName, backendStorage, imapStore); this.imapSync = new ImapSync(accountName, backendStorage, imapStore);
} }

30
k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java
View file

@ -49,7 +49,7 @@ import com.fsck.k9.activity.MessageReference;
import com.fsck.k9.activity.setup.AccountSetupCheckSettings.CheckDirection; import com.fsck.k9.activity.setup.AccountSetupCheckSettings.CheckDirection;
import com.fsck.k9.backend.api.BackendStorage; import com.fsck.k9.backend.api.BackendStorage;
import com.fsck.k9.backend.api.MessageRemovalListener; import com.fsck.k9.backend.api.MessageRemovalListener;
import com.fsck.k9.backend.api.RemoteMessageStore; import com.fsck.k9.backend.api.Backend;
import com.fsck.k9.backend.api.SyncConfig; import com.fsck.k9.backend.api.SyncConfig;
import com.fsck.k9.backend.api.SyncListener; import com.fsck.k9.backend.api.SyncListener;
import com.fsck.k9.cache.EmailProviderCache; import com.fsck.k9.cache.EmailProviderCache;
@ -61,7 +61,7 @@ import com.fsck.k9.controller.MessagingControllerCommands.PendingMarkAllAsRead;
import com.fsck.k9.controller.MessagingControllerCommands.PendingMoveOrCopy; import com.fsck.k9.controller.MessagingControllerCommands.PendingMoveOrCopy;
import com.fsck.k9.controller.MessagingControllerCommands.PendingSetFlag; import com.fsck.k9.controller.MessagingControllerCommands.PendingSetFlag;
import com.fsck.k9.controller.ProgressBodyFactory.ProgressListener; import com.fsck.k9.controller.ProgressBodyFactory.ProgressListener;
import com.fsck.k9.backend.imap.ImapMessageStore; import com.fsck.k9.backend.imap.ImapBackend;
import com.fsck.k9.helper.Contacts; import com.fsck.k9.helper.Contacts;
import com.fsck.k9.mail.Address; import com.fsck.k9.mail.Address;
import com.fsck.k9.mail.AuthenticationFailedException; import com.fsck.k9.mail.AuthenticationFailedException;
@ -143,7 +143,7 @@ public class MessagingController {
private final TransportProvider transportProvider; private final TransportProvider transportProvider;
private final AccountStatsCollector accountStatsCollector; private final AccountStatsCollector accountStatsCollector;
private final Map<String, ImapMessageStore> imapMessageStores = new HashMap<>(); private final Map<String, ImapBackend> imapBackends = new HashMap<>();
private MessagingListener checkMailListener = null; private MessagingListener checkMailListener = null;
@ -261,26 +261,26 @@ public class MessagingController {
throw new Error(e); throw new Error(e);
} }
private RemoteMessageStore getRemoteMessageStore(Account account) { private Backend getBackend(Account account) {
return account.getStoreUri().startsWith("imap") ? getImapMessageStore(account) : null; return account.getStoreUri().startsWith("imap") ? getImapBackend(account) : null;
} }
private ImapMessageStore getImapMessageStore(Account account) { private ImapBackend getImapBackend(Account account) {
synchronized (imapMessageStores) { synchronized (imapBackends) {
ImapMessageStore imapMessageStore = imapMessageStores.get(account.getUuid()); ImapBackend imapBackend = imapBackends.get(account.getUuid());
if (imapMessageStore != null) { if (imapBackend != null) {
return imapMessageStore; return imapBackend;
} }
} }
LocalStore localStore = getLocalStoreOrThrow(account); LocalStore localStore = getLocalStoreOrThrow(account);
synchronized (imapMessageStores) { synchronized (imapBackends) {
BackendStorage backendStorage = new K9BackendStorage(localStore); BackendStorage backendStorage = new K9BackendStorage(localStore);
ImapStore remoteStore = (ImapStore) getRemoteStoreOrThrow(account); ImapStore remoteStore = (ImapStore) getRemoteStoreOrThrow(account);
String accountName = account.getDescription(); String accountName = account.getDescription();
ImapMessageStore imapMessageStore = new ImapMessageStore(accountName, backendStorage, remoteStore); ImapBackend imapMessageStore = new ImapBackend(accountName, backendStorage, remoteStore);
imapMessageStores.put(account.getUuid(), imapMessageStore); imapBackends.put(account.getUuid(), imapMessageStore);
return imapMessageStore; return imapMessageStore;
} }
} }
@ -772,7 +772,7 @@ public class MessagingController {
@VisibleForTesting @VisibleForTesting
void synchronizeMailboxSynchronous(final Account account, final String folder, final MessagingListener listener, void synchronizeMailboxSynchronous(final Account account, final String folder, final MessagingListener listener,
Folder providedRemoteFolder) { Folder providedRemoteFolder) {
RemoteMessageStore remoteMessageStore = getRemoteMessageStore(account); Backend remoteMessageStore = getBackend(account);
if (remoteMessageStore != null) { if (remoteMessageStore != null) {
syncFolder(account, folder, listener, providedRemoteFolder, remoteMessageStore); syncFolder(account, folder, listener, providedRemoteFolder, remoteMessageStore);
} else { } else {
@ -781,7 +781,7 @@ public class MessagingController {
} }
private void syncFolder(Account account, String folder, MessagingListener listener, Folder providedRemoteFolder, private void syncFolder(Account account, String folder, MessagingListener listener, Folder providedRemoteFolder,
RemoteMessageStore remoteMessageStore) { Backend remoteMessageStore) {
Exception commandException = null; Exception commandException = null;
try { try {