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 always allow zooming but hide (provided the Android version supports
it) the on-screen zoom controls if the device supports multi-touch,
hence pinch-to-zoom.
* 'master' of https://github.com/mnb20/k-9:
High DPI version of archive button icon
Fixed whitespace
Remove TODO
Replaced archive icon. Still a bit crap, but better than my previous attempt.
Added batch buttons for Archive and Move. Made batch buttons configurable.
added gmx.com.
set delete policy to DELETE_POLICY_ON_DELETE for IMAP on automatic setup like manual setup does.
set default names for Archive and Spam on manual config like automatic setup does.
added message upload support.
added advanced option to create local-only folder.
disabled sync & push for local-only folders.
hid expunge, check_mail, and "Load up to x more" for local-only folders.
hid create/rename/delete folder options for webdav (someone give me a webdav account).
added advanced option to change if a folder is local-only or syncable.
add dialog to confirm clearing local messages, and if it should include local-only messages or just synced messages.
added advanced option to automatically upload on move from local-only to syncable.
changed background color in message list and subject color in message view of local-only messages.
changed: keep local-only messages in folders no longer on server instead of deleting folder, and mark folder as local-only.
added automatically fully downloading messages moved/copied to local-only folder.
added advanced options option (if not enabled, those settings will be hidden).
reworked onCreateFolder(), onRenameFolder(), onDeleteFolder().
added Store.isAppendCapable().
added LocalFolder.expunge() [unused].
Option to strip signature from quoted text in replies.
Strips signature from quoted text in replies (line of /^-- $/ or html
equivalent, and everything below). Per account.
"smaller" (and smaller) fonts by allowing the Accounts and Folder List
items to have a height smaller than the normal Android minimum. This
option is off by default to maintain existing behavior for
uninterested parties. The preferences text is not especially
compelling so could certainly be changed if better phrasing is found.
Refactor forwarding header (header-style quote header) into individual string pieces that are assembled in code to accommodate future HTML version of headers.
Introduced four new strings for translation.
