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
The (undocumented) method WebView.setEmbeddedTitleBar() was removed in
Android 4.1 which caused the message header to never be displayed.
This fallback is only a temporary fix. We really need to come up with a
solution that feels like the previous (setEmbeddedTitleBar) behavior.
build.xml and tests/build.xml:
updated general format to match what is generated in a new project.
moved targets common to both to build_common.xml.
replaced some exec calls (perl, mv) and inline javascript with ant tasks (including extensions from Android and ant-contrib).
build.xml:
fixed indentation.
privatized targets that don't need to be called directly from command-line.
renamed some properties.
tests/build.xml:
renamed test project from K9 to K9Tests.
tools/ant-contrib.jar:
new!
.gitignore:
added note about local per-repo rules.
.gitignore:
added files created by new targets.
build.xml:
removed targets install and reinstall.
modified target help to depend on android_rules.help and only explain targets defined here.
updated target javadoc.
added targets lint-xml, lint-html, and monkey.
added private target -pre-clean to remove files created by new targets.
tests/AndroidManifest.xml:
updated note on running the tests.
tests/ant.properties:
removed test.runner as target test is now overridden.
tests/build.xml:
removed target test-report as it is now integrated with overridden target test.
overrode target test to disable deleting coverage.em and use the new test runner.
overrode target help to depend on android_rules.help and only explain targets defined here.
added targets javadoc, lint-xml, lint-html, and artifacts.
added private target -pre-clean to remove files created by new targets.
tests/clean-tests.sh:
new sh script to run through all the tests.
