moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-12-12 02:42:18 -05:00
Code Issues Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Matthew Brace 2008-12-15 04:59:03 +00:00
parent c544596d8f
commit a4a07ebe19
3 changed files with 108 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
res/layout/account_setup_options.xml
View File

@ -1,60 +1,67 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <ScrollView
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical"> android:scrollbarStyle="outsideInset">
<TextView <LinearLayout
android:text="@string/account_setup_options_mail_check_frequency_label" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall" android:layout_height="fill_parent"
android:textColor="?android:attr/textColorPrimary" /> android:orientation="vertical">
<Spinner <TextView
android:id="@+id/account_check_frequency" android:text="@string/account_setup_options_mail_check_frequency_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent" />
<TextView
android:text="@string/account_setup_options_mail_display_count_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary" />
<Spinner
android:id="@+id/account_display_count"
android:layout_height="wrap_content"
android:layout_width="fill_parent" />
<CheckBox
android:id="@+id/account_default"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/account_setup_options_default_label" />
<CheckBox
android:id="@+id/account_notify"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/account_setup_options_notify_label" />
<CheckBox
android:id="@+id/account_notify_ringtone"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/account_setup_options_notify_ringtone_label" />
<View
android:layout_width="fill_parent"
android:layout_height="0px"
android:layout_weight="1" />
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="54px"
android:background="@drawable/bottombar_565">
<Button
android:id="@+id/next"
android:text="@string/next_action"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="fill_parent"
android:minWidth="@dimen/button_minWidth" android:textAppearance="?android:attr/textAppearanceSmall"
android:drawableRight="@drawable/button_indicator_next" android:textColor="?android:attr/textColorPrimary" />
android:layout_alignParentRight="true" <Spinner
android:layout_centerVertical="true" /> android:id="@+id/account_check_frequency"
</RelativeLayout> android:layout_height="wrap_content"
</LinearLayout> android:layout_width="fill_parent" />
<TextView
android:text="@string/account_setup_options_mail_display_count_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary" />
<Spinner
android:id="@+id/account_display_count"
android:layout_height="wrap_content"
android:layout_width="fill_parent" />
<CheckBox
android:id="@+id/account_default"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/account_setup_options_default_label" />
<CheckBox
android:id="@+id/account_notify"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/account_setup_options_notify_label" />
<CheckBox
android:id="@+id/account_notify_ringtone"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/account_setup_options_notify_ringtone_label" />
<View
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1" />
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="bottom|right"
android:background="@drawable/bottombar_565">
<Button
android:id="@+id/next"
android:text="@string/next_action"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:minWidth="@dimen/button_minWidth"
android:drawableRight="@drawable/button_indicator_next"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" />
</RelativeLayout>
</LinearLayout>
</ScrollView>

63
res/layout/accounts.xml
View File

@ -8,34 +8,41 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
/> />
<LinearLayout <ScrollView
android:id="@+id/empty" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical"> android:scrollbarStyle="outsideInset">
<TextView <LinearLayout
android:id="@+id/empty"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="fill_parent"
android:textSize="14sp" android:orientation="vertical">
android:text="@string/accounts_welcome" <TextView
android:textColor="?android:attr/textColorPrimary" /> android:layout_width="fill_parent"
<View
android:layout_width="fill_parent"
android:layout_height="0px"
android:layout_weight="1" />
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="54px"
android:background="@drawable/bottombar_565">
<Button
android:id="@+id/add_new_account"
android:layout_width="wrap_content"
android:minWidth="@dimen/button_minWidth"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/next_action" android:textSize="14sp"
android:drawableRight="@drawable/button_indicator_next" android:text="@string/accounts_welcome"
android:layout_alignParentRight="true" android:textColor="?android:attr/textColorPrimary" />
android:layout_centerVertical="true" /> <View
</RelativeLayout> android:layout_width="fill_parent"
</LinearLayout> android:layout_height="0px"
android:layout_weight="1" />
<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"
android:layout_width="wrap_content"
android:minWidth="@dimen/button_minWidth"
android:layout_height="wrap_content"
android:text="@string/next_action"
android:drawableRight="@drawable/button_indicator_next"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" />
</RelativeLayout>
</LinearLayout>
</ScrollView>
</FrameLayout> </FrameLayout>

14
src/com/fsck/k9/mail/store/WebDavStore.java
View File

@ -442,18 +442,28 @@ public class WebDavStore extends Store {
String url) throws IOException { String url) throws IOException {
String authPath = "/exchweb/bin/auth/owaauth.dll"; String authPath = "/exchweb/bin/auth/owaauth.dll";
CookieStore cookies = null; 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 */ /* Browser Client */
DefaultHttpClient httpclient = new DefaultHttpClient(); DefaultHttpClient httpclient = new DefaultHttpClient();
/* Post Method */ /* Post Method */
HttpPost httppost = new HttpPost(url + authPath); HttpPost httppost = new HttpPost(finalUrl + authPath);
/** Build the POST data to use */ /** Build the POST data to use */
ArrayList<BasicNameValuePair> pairs = new ArrayList(); ArrayList<BasicNameValuePair> pairs = new ArrayList();
pairs.add(new BasicNameValuePair("username", username)); pairs.add(new BasicNameValuePair("username", username));
pairs.add(new BasicNameValuePair("password", password)); 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("flags", "0"));
pairs.add(new BasicNameValuePair("SubmitCreds", "Log+On")); pairs.add(new BasicNameValuePair("SubmitCreds", "Log+On"));
pairs.add(new BasicNameValuePair("forcedownlevel", "0")); pairs.add(new BasicNameValuePair("forcedownlevel", "0"));