From b39f9b95f101ea378bfd697d722ade192cc2aa0e Mon Sep 17 00:00:00 2001
From: Joe Steele <joe@madewell.net>
Date: Mon, 18 Aug 2014 18:15:17 -0400
Subject: [PATCH] Move initializeViewListeners() to onPostCreate()

Per comments in PR #474

https://github.com/k9mail/k-9/pull/474#commitcomment-7417262
---
 .../fsck/k9/activity/setup/AccountSetupBasics.java    | 11 ++++++-----
 .../fsck/k9/activity/setup/AccountSetupIncoming.java  |  9 ++-------
 .../fsck/k9/activity/setup/AccountSetupOutgoing.java  | 10 +++++-----
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/com/fsck/k9/activity/setup/AccountSetupBasics.java b/src/com/fsck/k9/activity/setup/AccountSetupBasics.java
index d230d423b..e57a09ffe 100644
--- a/src/com/fsck/k9/activity/setup/AccountSetupBasics.java
+++ b/src/com/fsck/k9/activity/setup/AccountSetupBasics.java
@@ -86,11 +86,6 @@ public class AccountSetupBasics extends K9Activity
 
         mNextButton.setOnClickListener(this);
         mManualSetupButton.setOnClickListener(this);
-
-        if (savedInstanceState == null) {
-            initializeViewListeners();
-            validateFields();
-        }
     }
 
     private void initializeViewListeners() {
@@ -129,6 +124,12 @@ public class AccountSetupBasics extends K9Activity
 
         updateViewVisibility(mClientCertificateCheckBox.isChecked());
 
+    }
+
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+
         /*
          * We wait until now to initialize the listeners because we didn't want
          * the OnCheckedChangeListener active while the
diff --git a/src/com/fsck/k9/activity/setup/AccountSetupIncoming.java b/src/com/fsck/k9/activity/setup/AccountSetupIncoming.java
index f5cfce12c..ff4cd531b 100644
--- a/src/com/fsck/k9/activity/setup/AccountSetupIncoming.java
+++ b/src/com/fsck/k9/activity/setup/AccountSetupIncoming.java
@@ -295,11 +295,6 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
             mCurrentPortViewSetting = mPortView.getText().toString();
 
             mSubscribedFoldersOnly.setChecked(mAccount.subscribedFoldersOnly());
-
-            if (savedInstanceState == null) {
-                initializeViewListeners();
-                validateFields();
-            }
         } catch (Exception e) {
             failure(e);
         }
@@ -383,8 +378,8 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
     }
 
     @Override
-    protected void onRestoreInstanceState(Bundle savedInstanceState) {
-        super.onRestoreInstanceState(savedInstanceState);
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
 
         /*
          * We didn't want the listeners active while the state was being restored
diff --git a/src/com/fsck/k9/activity/setup/AccountSetupOutgoing.java b/src/com/fsck/k9/activity/setup/AccountSetupOutgoing.java
index 4cff98fe6..94b704774 100644
--- a/src/com/fsck/k9/activity/setup/AccountSetupOutgoing.java
+++ b/src/com/fsck/k9/activity/setup/AccountSetupOutgoing.java
@@ -191,11 +191,6 @@ public class AccountSetupOutgoing extends K9Activity implements OnClickListener,
                 updatePortFromSecurityType();
             }
             mCurrentPortViewSetting = mPortView.getText().toString();
-
-            if (savedInstanceState == null) {
-                initializeViewListeners();
-                validateFields();
-            }
         } catch (Exception e) {
             /*
              * We should always be able to parse our own settings.
@@ -316,6 +311,11 @@ public class AccountSetupOutgoing extends K9Activity implements OnClickListener,
         } else {
             mRequireLoginSettingsView.setVisibility(View.GONE);
         }
+    }
+
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
 
         /*
          * We didn't want the listeners active while the state was being restored