From b10b13b865ebacbd22ec512cd0738dc09371adb8 Mon Sep 17 00:00:00 2001
From: Joe Steele <joe@madewell.net>
Date: Sat, 19 Jul 2014 17:23:38 -0400
Subject: [PATCH] Force manual setup if using client certificates

Presently, auto-setup doesn't support certificates,
resulting in "Cannot connect to server. (Error
while decoding store URI)".
---
 src/com/fsck/k9/activity/setup/AccountSetupBasics.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/com/fsck/k9/activity/setup/AccountSetupBasics.java b/src/com/fsck/k9/activity/setup/AccountSetupBasics.java
index 0189347ed..4d5e99ab6 100644
--- a/src/com/fsck/k9/activity/setup/AccountSetupBasics.java
+++ b/src/com/fsck/k9/activity/setup/AccountSetupBasics.java
@@ -303,6 +303,13 @@ public class AccountSetupBasics extends K9Activity
     }
 
     protected void onNext() {
+        if (mClientCertificateCheckBox.isChecked()) {
+
+            // Auto-setup doesn't support client certificates.
+            onManualSetup();
+            return;
+        }
+
         String email = mEmailView.getText().toString();
         String[] emailParts = splitEmail(email);
         String domain = emailParts[1];