Fixed an authentication issue with WebDav support that caused by the last update. Added support for scrolling on 2 of the screens in the account setup process to allow the full steps to be done in landscape mode. There are some graphical regressions in portrait mode from it that aren't resolved yet.

res/layout/account_setup_options.xml

@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:scrollbarStyle="outsideInset">
+    <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
@@ -41,11 +46,12 @@
             android:text="@string/account_setup_options_notify_ringtone_label" />
         <View
             android:layout_width="fill_parent"
-        android:layout_height="0px"
+            android:layout_height="fill_parent"
             android:layout_weight="1" />
         <RelativeLayout
             android:layout_width="fill_parent"
-        android:layout_height="54px"
+            android:layout_height="fill_parent"
+            android:gravity="bottom|right"
             android:background="@drawable/bottombar_565">
             <Button
                 android:id="@+id/next"
@@ -57,4 +63,5 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true" />
         </RelativeLayout>
-</LinearLayout>
+    </LinearLayout>
+</ScrollView>

res/layout/accounts.xml

@@ -8,6 +8,11 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         />
+    <ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:scrollbarStyle="outsideInset">
         <LinearLayout
             android:id="@+id/empty"
             android:layout_width="fill_parent"
@@ -26,6 +31,7 @@
             <RelativeLayout
                 android:layout_width="fill_parent"
                 android:layout_height="54px"
+                android:gravity="bottom|right"
                 android:background="@drawable/bottombar_565">
                 <Button
                     android:id="@+id/add_new_account"
@@ -38,4 +44,5 @@
                     android:layout_centerVertical="true" />
             </RelativeLayout>
         </LinearLayout>
+    </ScrollView>
 </FrameLayout>

src/com/fsck/k9/mail/store/WebDavStore.java

@@ -442,18 +442,28 @@ public class WebDavStore extends Store {
                                         String url) throws IOException {
         String authPath = "/exchweb/bin/auth/owaauth.dll";
         CookieStore cookies = null;
+        String[] urlParts = url.split("/");
+        String finalUrl = "";
+
+        for (int i = 0; i <= 2; i++) {
+            if (i != 0) {
+                finalUrl = finalUrl + "/" + urlParts[i];
+            } else {
+                finalUrl = urlParts[i];
+            }
+        }
             
         /* Browser Client */
         DefaultHttpClient httpclient = new DefaultHttpClient();
 
         /* Post Method */
-        HttpPost httppost = new HttpPost(url + authPath);
+        HttpPost httppost = new HttpPost(finalUrl + authPath);
 
         /** Build the POST data to use */
         ArrayList<BasicNameValuePair> pairs = new ArrayList();
         pairs.add(new BasicNameValuePair("username", username));
         pairs.add(new BasicNameValuePair("password", password));
-        pairs.add(new BasicNameValuePair("destination", url + "/Exchange/"));
+        pairs.add(new BasicNameValuePair("destination", finalUrl + "/Exchange/"));
         pairs.add(new BasicNameValuePair("flags", "0"));
         pairs.add(new BasicNameValuePair("SubmitCreds", "Log+On"));
         pairs.add(new BasicNameValuePair("forcedownlevel", "0"));