moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-25 07:01:50 -05:00
Code Issues Releases Wiki Activity

Remove Preferences dependency

Browse Source
This commit is contained in:
Jan Berkel 2014-12-12 12:42:48 +00:00
parent 9f16b9f465
commit 6264527abc
5 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/com/fsck/k9/activity/ChooseFolder.java
View File

@ -280,22 +280,16 @@ public class ChooseFolder extends K9ListActivity {
mAccount.getInboxFolderName().equalsIgnoreCase(name)))) { mAccount.getInboxFolderName().equalsIgnoreCase(name)))) {
continue; continue;
} }
try { Folder.FolderClass fMode = folder.getDisplayClass();
folder.refresh(prefs);
Folder.FolderClass fMode = folder.getDisplayClass();
if ((aMode == Account.FolderMode.FIRST_CLASS && if ((aMode == FolderMode.FIRST_CLASS &&
fMode != Folder.FolderClass.FIRST_CLASS) || ( fMode != Folder.FolderClass.FIRST_CLASS) || (
aMode == Account.FolderMode.FIRST_AND_SECOND_CLASS && aMode == FolderMode.FIRST_AND_SECOND_CLASS &&
fMode != Folder.FolderClass.FIRST_CLASS && fMode != Folder.FolderClass.FIRST_CLASS &&
fMode != Folder.FolderClass.SECOND_CLASS) || ( fMode != Folder.FolderClass.SECOND_CLASS) || (
aMode == Account.FolderMode.NOT_SECOND_CLASS && aMode == FolderMode.NOT_SECOND_CLASS &&
fMode == Folder.FolderClass.SECOND_CLASS)) { fMode == Folder.FolderClass.SECOND_CLASS)) {
continue; continue;
}
} catch (MessagingException me) {
Log.e(K9.LOG_TAG, "Couldn't get prefs to check for displayability of folder " +
folder.getName(), me);
} }
if (folder.isInTopGroup()) { if (folder.isInTopGroup()) {

20
src/com/fsck/k9/activity/FolderList.java
View File

@ -749,20 +749,14 @@ public class FolderList extends K9ListActivity {
Account.FolderMode aMode = account.getFolderDisplayMode(); Account.FolderMode aMode = account.getFolderDisplayMode();
Preferences prefs = Preferences.getPreferences(getApplication().getApplicationContext()); Preferences prefs = Preferences.getPreferences(getApplication().getApplicationContext());
for (Folder folder : folders) { for (Folder folder : folders) {
try { Folder.FolderClass fMode = folder.getDisplayClass();
folder.refresh(prefs);
Folder.FolderClass fMode = folder.getDisplayClass(); if ((aMode == FolderMode.FIRST_CLASS && fMode != Folder.FolderClass.FIRST_CLASS)
|| (aMode == FolderMode.FIRST_AND_SECOND_CLASS &&
if ((aMode == Account.FolderMode.FIRST_CLASS && fMode != Folder.FolderClass.FIRST_CLASS) fMode != Folder.FolderClass.FIRST_CLASS &&
|| (aMode == Account.FolderMode.FIRST_AND_SECOND_CLASS && fMode != Folder.FolderClass.SECOND_CLASS)
fMode != Folder.FolderClass.FIRST_CLASS && || (aMode == FolderMode.NOT_SECOND_CLASS && fMode == Folder.FolderClass.SECOND_CLASS)) {
fMode != Folder.FolderClass.SECOND_CLASS) continue;
|| (aMode == Account.FolderMode.NOT_SECOND_CLASS && fMode == Folder.FolderClass.SECOND_CLASS)) {
continue;
}
} catch (MessagingException me) {
Log.e(K9.LOG_TAG, "Couldn't get prefs to check for displayability of folder " + folder.getName(), me);
} }
FolderInfoHolder holder = null; FolderInfoHolder holder = null;

3
src/com/fsck/k9/controller/MessagingController.java
View File

@ -694,6 +694,7 @@ public class MessagingController implements Runnable {
@Override @Override
public void messagesFinished(int number) {} public void messagesFinished(int number) {}
@Override @Override
public void messageFinished(LocalMessage message, int number, int ofTotal) { public void messageFinished(LocalMessage message, int number, int ofTotal) {
if (!isMessageSuppressed(message)) { if (!isMessageSuppressed(message)) {
List<LocalMessage> messages = new ArrayList<LocalMessage>(); List<LocalMessage> messages = new ArrayList<LocalMessage>();
@ -4391,7 +4392,6 @@ public class MessagingController implements Runnable {
Store localStore = account.getLocalStore(); Store localStore = account.getLocalStore();
for (final Folder folder : localStore.getPersonalNamespaces(false)) { for (final Folder folder : localStore.getPersonalNamespaces(false)) {
folder.open(Folder.OPEN_MODE_RW); folder.open(Folder.OPEN_MODE_RW);
folder.refresh(prefs);
Folder.FolderClass fDisplayClass = folder.getDisplayClass(); Folder.FolderClass fDisplayClass = folder.getDisplayClass();
Folder.FolderClass fSyncClass = folder.getSyncClass(); Folder.FolderClass fSyncClass = folder.getSyncClass();
@ -5305,7 +5305,6 @@ public class MessagingController implements Runnable {
continue; continue;
} }
folder.open(Folder.OPEN_MODE_RW); folder.open(Folder.OPEN_MODE_RW);
folder.refresh(prefs);
Folder.FolderClass fDisplayClass = folder.getDisplayClass(); Folder.FolderClass fDisplayClass = folder.getDisplayClass();
Folder.FolderClass fPushClass = folder.getPushClass(); Folder.FolderClass fPushClass = folder.getPushClass();

5
src/com/fsck/k9/mail/Folder.java
View File

@ -8,7 +8,6 @@ import java.util.Set;
import android.util.Log; import android.util.Log;
import com.fsck.k9.K9; import com.fsck.k9.K9;
import com.fsck.k9.Preferences;
import com.fsck.k9.controller.MessageRetrievalListener; import com.fsck.k9.controller.MessageRetrievalListener;
public abstract class Folder<T extends Message> { public abstract class Folder<T extends Message> {
@ -217,10 +216,6 @@ public abstract class Folder<T extends Message> {
return getSyncClass(); return getSyncClass();
} }
public void refresh(Preferences preferences) throws MessagingException {
}
public boolean isInTopGroup() { public boolean isInTopGroup() {
return false; return false;
} }

1
src/com/fsck/k9/mail/store/StoreConfig.java
View File

@ -17,6 +17,7 @@ public interface StoreConfig {
void setSpamFolderName(String name); void setSpamFolderName(String name);
void setSentFolderName(String name); void setSentFolderName(String name);
void setAutoExpandFolderName(String name); void setAutoExpandFolderName(String name);
void setInboxFolderName(String name);
int getMaximumAutoDownloadMessageSize(); int getMaximumAutoDownloadMessageSize();