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
* master-actionbar: (103 commits)
Revert "Context actionbar for the account screen."
Revert "Add context action bar on FolderList activity." - We are not ready for this sort of future yet ;)
re Bernhard's Issue 4543 fix: only set as read if account.isMarkMessageAsReadOnView()
Fixes 4517: Junk special folder not autoconfigured (rfc6154 implementation was incomplete)
Fixed Issue 4543: Msg UnRead after "Download Complete" pressed
fixed download complete message button
Set (un)read toggle title based on current message state.
Rename some one-letter variables.
Fix whitespace; no functional changes.
Move message selection functionality into the MessageAdapter.
When we're at the end of the message list, dim the next or prev button instead of making it vanish
Don't show the menu button twice. (Don't show it even once on Gingerbread devices, all of which had a hardware menu button)
Remove "flag" as a meessage view menu option (duplicates tapping on the star)
Move "move" and "copy" out of a submenu
Show the subject line in the MessageHeader if the ActionBar title was truncated.
Add icons for the dark theme and make them active.
Set abs title to (no subject) if the message has no subject.
Hide the unread message count in the actionbar when doing an explicit search.
Hide subject line in MessageView since it's now displayed in the actionbar.
IntelliJ IDEA: More build config fixes for ABS.
...
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
