moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-17 07:30:16 -05:00
Code Issues Releases Wiki Activity

WebDavStore cleanup

Browse Source 
Store port number so we can throw away the store URI once decoded
This commit is contained in:
cketti 2011-06-07 03:01:02 +02:00
parent 29738993d9
commit 25c1a565e7
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,8 +181,8 @@ public class WebDavStore extends Store {
} }
} }
return new WebDavStoreSettings(host, port, connectionSecurity, null, return new WebDavStoreSettings(host, port, connectionSecurity, null, username, password,
username, password, alias, path, authPath, mailboxPath, webDavUri); alias, path, authPath, mailboxPath);
} }
/** /**
@ -200,17 +200,15 @@ public class WebDavStore extends Store {
public final String path; public final String path;
public final String authPath; public final String authPath;
public final String mailboxPath; public final String mailboxPath;
public final URI uri;
protected WebDavStoreSettings(String host, int port, ConnectionSecurity connectionSecurity, protected WebDavStoreSettings(String host, int port, ConnectionSecurity connectionSecurity,
String authenticationType, String username, String password, String alias, String authenticationType, String username, String password, String alias,
String path, String authPath, String mailboxPath, URI uri) { String path, String authPath, String mailboxPath) {
super(host, port, connectionSecurity, authenticationType, username, password); super(host, port, connectionSecurity, authenticationType, username, password);
this.alias = alias; this.alias = alias;
this.path = path; this.path = path;
this.authPath = authPath; this.authPath = authPath;
this.mailboxPath = mailboxPath; this.mailboxPath = mailboxPath;
this.uri = uri;
} }
@Override @Override
@ -231,10 +229,10 @@ public class WebDavStore extends Store {
private String mPassword; /* Stores the password for authentications */ private String mPassword; /* Stores the password for authentications */
private String mUrl; /* Stores the base URL for the server */ private String mUrl; /* Stores the base URL for the server */
private String mHost; /* Stores the host name for the server */ private String mHost; /* Stores the host name for the server */
private int mPort;
private String mPath; /* Stores the path for the server */ private String mPath; /* Stores the path for the server */
private String mAuthPath; /* Stores the path off of the server to post data to for form based authentication */ private String mAuthPath; /* Stores the path off of the server to post data to for form based authentication */
private String mMailboxPath; /* Stores the user specified path to the mailbox */ private String mMailboxPath; /* Stores the user specified path to the mailbox */
private URI mUri; /* Stores the Uniform Resource Indicator with all connection info */
private boolean mSecure; private boolean mSecure;
private WebDavHttpClient mHttpClient = null; private WebDavHttpClient mHttpClient = null;
@ -257,7 +255,7 @@ public class WebDavStore extends Store {
} }
mHost = settings.host; mHost = settings.host;
mUri = settings.uri; mPort = settings.port;
switch (settings.connectionSecurity) { switch (settings.connectionSecurity) {
case NONE: case NONE:
@ -322,7 +320,7 @@ public class WebDavStore extends Store {
} else { } else {
root = "http"; root = "http";
} }
root += "://" + mHost + ":" + mUri.getPort(); root += "://" + mHost + ":" + mPort;
return root; return root;
} }