moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-19 20:21:45 -05:00
Code Issues Releases Wiki Activity

Revert unused code changes

Browse Source
This commit is contained in:
Joe Steele 2014-07-18 12:39:11 -04:00
parent 38e9af5320
commit 88016ae52e
4 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/fsck/k9/Account.java
View File

@ -1305,10 +1305,6 @@ public class Account implements BaseAccount {
return Store.getRemoteInstance(this); return Store.getRemoteInstance(this);
} }
public Store getRemoteStore(boolean reload) throws MessagingException {
return Store.getRemoteInstance(this, reload);
}
// It'd be great if this actually went into the store implementation // It'd be great if this actually went into the store implementation
// to get this, but that's expensive and not easily accessible // to get this, but that's expensive and not easily accessible
// during initialization // during initialization

6
src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java
View File

@ -72,8 +72,6 @@ public class AccountSetupCheckSettings extends K9Activity implements OnClickList
private Account mAccount; private Account mAccount;
private boolean mIsClientCertSet;
private CheckDirection mDirection; private CheckDirection mDirection;
private boolean mCanceled; private boolean mCanceled;
@ -122,9 +120,7 @@ public class AccountSetupCheckSettings extends K9Activity implements OnClickList
mAccount, mDirection); mAccount, mDirection);
if (mDirection.equals(CheckDirection.INCOMING)) { if (mDirection.equals(CheckDirection.INCOMING)) {
// refresh URI that stores settings in order to include store = mAccount.getRemoteStore();
// client certificate set by user
store = mAccount.getRemoteStore(mIsClientCertSet);
if (store instanceof WebDavStore) { if (store instanceof WebDavStore) {
setMessage(R.string.account_setup_check_settings_authenticate); setMessage(R.string.account_setup_check_settings_authenticate);

12
src/com/fsck/k9/mail/Store.java
View File

@ -51,16 +51,6 @@ public abstract class Store {
* Get an instance of a remote mail store. * Get an instance of a remote mail store.
*/ */
public synchronized static Store getRemoteInstance(Account account) throws MessagingException { public synchronized static Store getRemoteInstance(Account account) throws MessagingException {
return getRemoteInstance(account, false);
}
/**
* Get an instance of a remote mail store.
*
* @param reload
* reload store also if already instantiated
*/
public synchronized static Store getRemoteInstance(Account account, boolean reload) throws MessagingException {
String uri = account.getStoreUri(); String uri = account.getStoreUri();
if (uri.startsWith("local")) { if (uri.startsWith("local")) {
@ -68,7 +58,7 @@ public abstract class Store {
} }
Store store = sStores.get(uri); Store store = sStores.get(uri);
if (store == null || reload) { if (store == null) {
if (uri.startsWith("imap")) { if (uri.startsWith("imap")) {
store = new ImapStore(account); store = new ImapStore(account);
} else if (uri.startsWith("pop3")) { } else if (uri.startsWith("pop3")) {

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

@ -290,7 +290,6 @@ public class WebDavStore extends Store {
private String mUsername; /* Stores the username for authentications */ private String mUsername; /* Stores the username for authentications */
private String mAlias; /* Stores the alias for the user's mailbox */ private String mAlias; /* Stores the alias for the user's mailbox */
private String mPassword; /* Stores the password for authentications */ private String mPassword; /* Stores the password for authentications */
private String mClientCertificateAlias;
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 int mPort;
@ -326,7 +325,6 @@ public class WebDavStore extends Store {
mUsername = settings.username; mUsername = settings.username;
mPassword = settings.password; mPassword = settings.password;
mClientCertificateAlias = settings.clientCertificateAlias;
mAlias = settings.alias; mAlias = settings.alias;
mPath = settings.path; mPath = settings.path;