Conflicts:
res/menu/folder_list_option.xml
res/menu/message_list_context.xml
res/menu/message_list_option.xml
res/menu/message_view_option.xml
src/com/fsck/k9/Account.java
src/com/fsck/k9/activity/ChooseFolder.java
src/com/fsck/k9/activity/FolderList.java
src/com/fsck/k9/activity/MessageList.java
src/com/fsck/k9/activity/MessageView.java
src/com/fsck/k9/activity/setup/AccountSettings.java
src/com/fsck/k9/activity/setup/FolderSettings.java
src/com/fsck/k9/controller/MessagingController.java
src/com/fsck/k9/preferences/AccountSettings.java
FUCK YEAH. though this code needs some serious review, please.
also, it will usually FC when opening a message, but if one is
open then next/prev will work just fine.
Conflicts:
src/com/fsck/k9/activity/ChooseFolder.java
src/com/fsck/k9/controller/MessagingController.java
src/com/fsck/k9/mail/store/ImapStore.java
src/com/fsck/k9/view/MessageHeader.java
I hacked on src/com/fsck/k9/controller/MessagingController.java and perhaps broke uidplus support,
but things run fine in my simple tests.
Conflicts:
src/com/fsck/k9/activity/FolderList.java
src/com/fsck/k9/activity/MessageList.java
src/com/fsck/k9/activity/MessageView.java
src/com/fsck/k9/activity/setup/AccountSettings.java
Resolutions:
controller/MessagingController.java:
public boolean isMoveCapable(final Account account)
public boolean isMoveCapable(Message message)
activity/setup/AccountSettings.java:
private boolean mIsMoveCapable = false; // ASH i seem to have removed this, or renamed it to mIsAppendCapable
We're not ready for this sort of living in the futre yet.
This reverts commit 0f51eb54c1.
Conflicts:
res/drawable-hdpi/ic_action_settings_light.png
res/drawable-ldpi/ic_action_settings_light.png
res/drawable-mdpi/ic_action_settings_light.png
res/drawable-xhdpi/ic_action_settings_light.png
res/menu/accounts_context.xml
res/values/strings.xml
src/com/fsck/k9/activity/Accounts.java
Now that the subject line is gone, the right side of the header is now the tallest part of the header.
Put date and time on the same line to keep the header compact.