Merge branch 'master' into uidplus

Conflicts:
	src/com/fsck/k9/controller/MessagingController.java
	src/com/fsck/k9/mail/store/WebDavStore.java

.classpath

@@ -8,5 +8,6 @@
 	<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="output" path="bin"/>
+	<classpathentry kind="lib" path="libs/htmlcleaner-2.2.jar"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

.gitignore

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

Android.mk

@@ -6,6 +6,7 @@ LOCAL_STATIC_JAVA_LIBRARIES += libdom
 LOCAL_STATIC_JAVA_LIBRARIES += libio
 LOCAL_STATIC_JAVA_LIBRARIES += libjutf
 LOCAL_STATIC_JAVA_LIBRARIES += libjzlib
+LOCAL_STATIC_JAVA_LIBRARIES += libhtmlcleaner
 
 LOCAL_MODULE_TAGS := eng
 
@@ -24,6 +25,7 @@ LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libdom:libs/apache-mime4j-dom-0.7-SNAPSH
 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
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libhtmlcleaner:libs/htmlcleaner-2.2.jar
 
 include $(BUILD_MULTI_PREBUILT)
 

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="14001"
+    android:versionCode="15009"
-    android:versionName="3.900" package="com.fsck.k9"
+    android:versionName="4.109" package="com.fsck.k9"
     >
     <uses-sdk
-       android:minSdkVersion="3"
+       android:minSdkVersion="7"
-       android:targetSdkVersion="4"
+       android:targetSdkVersion="7"
        />
     <supports-screens
         android:largeScreens="true"
@@ -26,6 +26,7 @@
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
     <uses-permission android:name="org.thialfihar.android.apg.permission.READ_KEY_DETAILS" />
 
     <permission android:name="com.fsck.k9.permission.READ_ATTACHMENT"
@@ -42,16 +43,17 @@
     <uses-permission android:name="com.fsck.k9.permission.REMOTE_CONTROL"/>
     <permission android:name="com.fsck.k9.permission.READ_MESSAGES"
                 android:permissionGroup="android.permission-group.MESSAGES"
-                android:protectionLevel="normal"
+                android:protectionLevel="dangerous"
                 android:label="@string/read_messages_label"
                 android:description="@string/read_messages_desc"/>
     <uses-permission android:name="com.fsck.k9.permission.READ_MESSAGES"/>
     <permission android:name="com.fsck.k9.permission.DELETE_MESSAGES"
                 android:permissionGroup="android.permission-group.MESSAGES"
-                android:protectionLevel="normal"
+                android:protectionLevel="dangerous"
                 android:label="@string/delete_messages_label"
                 android:description="@string/read_messages_desc"/>
     <uses-permission android:name="com.fsck.k9.permission.DELETE_MESSAGES"/>
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
     <application
         android:icon="@drawable/icon"
         android:label="@string/app_name"
@@ -63,7 +65,7 @@
 
         <activity
             android:name="com.fsck.k9.activity.Accounts"
-            android:launchMode="singleInstance"
+            android:launchMode="singleTask"
             android:configChanges="locale"
             android:label="@string/app_name">
             <intent-filter>
@@ -71,12 +73,21 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <data android:mimeType="application/x-k9settings" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+            </intent-filter>
         </activity>
 
         <activity
             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
@@ -132,6 +143,7 @@
             android:theme="@style/Theme.K9Dialog"
             android:label="@string/choose_folder_title"
             android:configChanges="locale"
+            android:noHistory="true"
             >
         </activity>
         <activity
@@ -196,6 +208,10 @@
             android:launchMode="singleTask"
             android:configChanges="locale"
             >
+            <intent-filter>
+                <!-- This action is only to allow an entry point for launcher shortcuts -->
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
         </activity>
         <activity
             android:name="com.fsck.k9.activity.MessageView"
@@ -375,5 +391,25 @@ otherwise it would make K-9 start at the wrong time
             android:readPermission="com.fsck.k9.permission.READ_MESSAGES"
             android:writePermission="com.fsck.k9.permission.DELETE_MESSAGES"
             />
+
+        <receiver
+            android:name=".provider.UnreadWidgetProvider"
+            android:label="@string/unread_widget_label"
+            android:icon="@drawable/icon">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/unread_widget_info" />
+        </receiver>
+        <activity android:name=".activity.UnreadWidgetConfiguration">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".activity.AccountList">
+        </activity>
     </application>
 </manifest>

HTMLCLEANER_LICENSE

@@ -0,0 +1,35 @@
+HtmlCleaner is distributed under BSD License. It gives the freedom for
+anyone to use, explore, modify, and distribute HtmlCleaner, but without any
+warranty.
+
+    Copyright (c) 2006-2011, HtmlCleaner team.
+    All rights reserved.
+    
+    Redistribution and use of this software in source and binary forms, 
+    with or without modification, are permitted provided that the 
+    following conditions are met:
+    
+    * Redistributions of source code must retain the above
+      copyright notice, this list of conditions and the
+      following disclaimer.
+    
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the
+      following disclaimer in the documentation and/or other
+      materials provided with the distribution.
+    
+    * The name of HtmlCleaner may not be used to endorse or promote
+      products derived from this software without specific prior
+      written permission.
+    
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

ant.properties

@@ -0,0 +1,23 @@
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked in Version Control Systems, as it is
+# integral to the build system of your project.
+
+# This file is only used by the Ant script.
+
+# You can use this to override default values such as
+#  'source.dir' for the location of your java source folder and
+#  'out.dir' for the location of your output folder.
+
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+#  'key.store' for the location of your keystore and
+#  'key.alias' for the name of the key to use.
+# The password will be asked during the build when you use the 'release' target.
+
+# Indicates whether an apk should be generated for each density.
+split.density=false
+java.encoding=utf8
+# Project target.
+target=android-9
+extensible.libs.classpath=compile-only-libs