Merge branch 'master' into issue549

Conflicts:
	res/menu/accounts_context.xml
	res/menu/accounts_option.xml
	res/values/strings.xml
	src/com/fsck/k9/Account.java
	src/com/fsck/k9/activity/Accounts.java
	src/com/fsck/k9/activity/AsyncUIProcessor.java
	src/com/fsck/k9/activity/FolderList.java
	src/com/fsck/k9/activity/ImportListener.java
	src/com/fsck/k9/activity/K9Activity.java
	src/com/fsck/k9/activity/K9ListActivity.java
	src/com/fsck/k9/activity/MessageView.java
	src/com/fsck/k9/mail/store/ImapStore.java
	src/com/fsck/k9/mail/store/Pop3Store.java
	src/com/fsck/k9/mail/store/WebDavStore.java
	src/com/fsck/k9/mail/transport/SmtpTransport.java

.classpath

@@ -8,7 +8,5 @@
 	<classpathentry kind="lib" path="libs/commons-io-2.0.1.jar"/>
 	<classpathentry kind="lib" path="libs/jzlib-1.0.7.jar"/>
 	<classpathentry kind="lib" path="libs/jutf7-1.0.1-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="compile-only-libs/commons-codec-1.3.jar"/>
-	<classpathentry kind="lib" path="compile-only-libs/commons-logging-1.1.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

.gitignore

@@ -0,0 +1,5 @@
+local.properties
+bin
+gen
+.settings
+*~

Android.mk

@@ -1,10 +1,33 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
+LOCAL_STATIC_JAVA_LIBRARIES += libcore
+LOCAL_STATIC_JAVA_LIBRARIES += libdom
+LOCAL_STATIC_JAVA_LIBRARIES += libio
+LOCAL_STATIC_JAVA_LIBRARIES += libjutf
+LOCAL_STATIC_JAVA_LIBRARIES += libjzlib
+
 LOCAL_MODULE_TAGS := eng
 
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
+LOCAL_SDK_VERSION := current
+
 LOCAL_PACKAGE_NAME := Email
 
 include $(BUILD_PACKAGE)
+##################################################
+include $(CLEAR_VARS)
+
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libcore:libs/apache-mime4j-core-0.7-SNAPSHOT.jar
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libdom:libs/apache-mime4j-dom-0.7-SNAPSHOT.jar
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libio:libs/commons-io-2.0.1.jar
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libjutf:libs/jutf7-1.0.1-SNAPSHOT.jar
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libjzlib:libs/jzlib-1.0.7.jar
+
+include $(BUILD_MULTI_PREBUILT)
+
+
+# Use the folloing include to make our test apk.
+include $(call all-makefiles-under,$(LOCAL_PATH))
+

AndroidManifest.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="13007"
+    android:versionCode="14007"
-    android:versionName="3.706" package="com.fsck.k9"
+    android:versionName="3.907" package="com.fsck.k9"
     >
     <uses-sdk
-       android:minSdkVersion="3"
+       android:minSdkVersion="7"
-       android:targetSdkVersion="4"
+       android:targetSdkVersion="7"
        />
     <supports-screens
         android:largeScreens="true"
@@ -18,10 +18,6 @@
     <uses-permission android:name="android.permission.READ_CONTACTS"/>
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
 
-    <!-- Needed to get the owner name which is used when the first mail account is created -->
-    <uses-permission android:name="android.permission.READ_OWNER_DATA"/>
-    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
-
     <!-- Needed to mark a contact as contacted -->
     <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
 
@@ -30,6 +26,10 @@
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <!-- In order to properly manage the BACK key, we do some check on the running tasks -->
+    <uses-permission android:name="android.permission.GET_TASKS" />
+
     <uses-permission android:name="org.thialfihar.android.apg.permission.READ_KEY_DETAILS" />
 
     <permission android:name="com.fsck.k9.permission.READ_ATTACHMENT"
@@ -67,7 +67,7 @@
 
         <activity
             android:name="com.fsck.k9.activity.Accounts"
-            android:launchMode="singleTask"
+            android:launchMode="singleInstance"
             android:configChanges="locale"
             android:label="@string/app_name">
             <intent-filter>
@@ -87,6 +87,9 @@
             android:name="com.fsck.k9.activity.setup.Prefs"
             android:label="@string/prefs_title"
             android:configChanges="locale"
+            android:taskAffinity="com.fsck.k9.activity.setup.Prefs"
+            android:launchMode="singleTask"
+            android:excludeFromRecents="true"
             >
         </activity>
         <activity
@@ -142,6 +145,7 @@
             android:theme="@style/Theme.K9Dialog"
             android:label="@string/choose_folder_title"
             android:configChanges="locale"
+            android:noHistory="true"
             >
         </activity>
         <activity
@@ -203,7 +207,7 @@
         </activity>
         <activity
             android:name="com.fsck.k9.activity.MessageList"
-            android:launchMode="singleTask"
+            android:launchMode="singleInstance"
             android:configChanges="locale"
             >
         </activity>
@@ -275,10 +279,6 @@
             android:name="com.fsck.k9.activity.AccessibleEmailContentActivity"
             >
         </activity>
-        <activity
-            android:name="com.fsck.k9.activity.ImportSettingsActivity"
-            >
-        </activity>
 
         <receiver android:name="com.fsck.k9.service.BootReceiver"
               android:enabled="true"

assets/downloading.html

@@ -2,7 +2,7 @@
 	<body bgcolor="white">
 		<table width="100%" height="100%">
 			<tr>
-				<td align="center" valign="center">
+				<td align="center" valign="middle">
 					<font color="gray">Downloading...</font>
 					<br/>
 					<br/>