From 88016ae52efa78666288ca6b5f95bc53d6d303c5 Mon Sep 17 00:00:00 2001
From: Joe Steele <joe@madewell.net>
Date: Fri, 18 Jul 2014 12:39:11 -0400
Subject: [PATCH] Revert unused code changes

---
 src/com/fsck/k9/Account.java                         |  4 ----
 .../k9/activity/setup/AccountSetupCheckSettings.java |  6 +-----
 src/com/fsck/k9/mail/Store.java                      | 12 +-----------
 src/com/fsck/k9/mail/store/WebDavStore.java          |  2 --
 4 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/src/com/fsck/k9/Account.java b/src/com/fsck/k9/Account.java
index bfab78d36..40b4ebaef 100644
--- a/src/com/fsck/k9/Account.java
+++ b/src/com/fsck/k9/Account.java
@@ -1305,10 +1305,6 @@ public class Account implements BaseAccount {
         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
     // to get this, but that's expensive and not easily accessible
     // during initialization
diff --git a/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java b/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java
index e60ddb53c..88e1f86e3 100644
--- a/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java
+++ b/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java
@@ -72,8 +72,6 @@ public class AccountSetupCheckSettings extends K9Activity implements OnClickList
 
     private Account mAccount;
 
-    private boolean mIsClientCertSet;
-
     private CheckDirection mDirection;
 
     private boolean mCanceled;
@@ -122,9 +120,7 @@ public class AccountSetupCheckSettings extends K9Activity implements OnClickList
                             mAccount, mDirection);
 
                     if (mDirection.equals(CheckDirection.INCOMING)) {
-                        // refresh URI that stores settings in order to include
-                        // client certificate set by user
-                        store = mAccount.getRemoteStore(mIsClientCertSet);
+                        store = mAccount.getRemoteStore();
 
                         if (store instanceof WebDavStore) {
                             setMessage(R.string.account_setup_check_settings_authenticate);
diff --git a/src/com/fsck/k9/mail/Store.java b/src/com/fsck/k9/mail/Store.java
index 7413cb9ae..45efb2a34 100644
--- a/src/com/fsck/k9/mail/Store.java
+++ b/src/com/fsck/k9/mail/Store.java
@@ -51,16 +51,6 @@ public abstract class Store {
      * Get an instance of a remote mail store.
      */
     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();
 
         if (uri.startsWith("local")) {
@@ -68,7 +58,7 @@ public abstract class Store {
         }
 
         Store store = sStores.get(uri);
-        if (store == null || reload) {
+        if (store == null) {
             if (uri.startsWith("imap")) {
                 store = new ImapStore(account);
             } else if (uri.startsWith("pop3")) {
diff --git a/src/com/fsck/k9/mail/store/WebDavStore.java b/src/com/fsck/k9/mail/store/WebDavStore.java
index ba817c753..44493588d 100644
--- a/src/com/fsck/k9/mail/store/WebDavStore.java
+++ b/src/com/fsck/k9/mail/store/WebDavStore.java
@@ -290,7 +290,6 @@ public class WebDavStore extends Store {
     private String mUsername; /* Stores the username for authentications */
     private String mAlias; /* Stores the alias for the user's mailbox */
     private String mPassword; /* Stores the password for authentications */
-    private String mClientCertificateAlias;
     private String mUrl; /* Stores the base URL for the server */
     private String mHost; /* Stores the host name for the server */
     private int mPort;
@@ -326,7 +325,6 @@ public class WebDavStore extends Store {
 
         mUsername = settings.username;
         mPassword = settings.password;
-        mClientCertificateAlias = settings.clientCertificateAlias;
         mAlias = settings.alias;
 
         mPath = settings.path;