From 877427f1108cd9345a6a79e1c9de43e430979ed0 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Sun, 26 Dec 2010 03:49:06 +0000
Subject: [PATCH] cut down a couple overly verbose conditionals

---
 src/com/fsck/k9/activity/MessageView.java | 48 ++++++-----------------
 1 file changed, 11 insertions(+), 37 deletions(-)

diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java
index e70de26e9..26723e3ee 100644
--- a/src/com/fsck/k9/activity/MessageView.java
+++ b/src/com/fsck/k9/activity/MessageView.java
@@ -997,64 +997,38 @@ public class MessageView extends K9Activity implements OnClickListener
                 }
             }
         }
-
         if (K9.DEBUG)
             Log.d(K9.LOG_TAG, "MessageView got message " + mMessageReference);
-
-
-
-
-        boolean goNext = intent.getBooleanExtra(EXTRA_NEXT, false);
-        if (goNext)
+        if (intent.getBooleanExtra(EXTRA_NEXT, false))
         {
             next.requestFocus();
         }
         // Perhaps the ScrollButtons should be global, instead of account-specific
         mAccount = Preferences.getPreferences(this).getAccount(mMessageReference.accountUuid);
         Account.ScrollButtons scrollButtons = mAccount.getScrollMessageViewButtons();
-
-        //MessagingController.getInstance(getApplication()).addListener(mListener);
-        if (Account.ScrollButtons.ALWAYS == scrollButtons)
+        if
+                ((Account.ScrollButtons.ALWAYS == scrollButtons)
+                 ||
+                 (Account.ScrollButtons.KEYBOARD_AVAILABLE == scrollButtons &&
+                  (this.getResources().getConfiguration().hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO)))
         {
             scrollButtons();
         }
-        else if (Account.ScrollButtons.NEVER == scrollButtons)
+        else      // never or the keyboard is open
         {
             staticButtons();
         }
-        else   // Account.ScrollButtons.KEYBOARD_AVAIL
-        {
-            if (this.getResources().getConfiguration().hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO)
-            {
-                scrollButtons();
-            }
-            else
-            {
-                staticButtons();
-            }
-        }
-
         Account.ScrollButtons scrollMoveButtons = mAccount.getScrollMessageViewMoveButtons();
-        if (Account.ScrollButtons.ALWAYS == scrollMoveButtons)
+        if ((Account.ScrollButtons.ALWAYS == scrollMoveButtons)
+            || (Account.ScrollButtons.KEYBOARD_AVAILABLE == scrollMoveButtons &&
+                (this.getResources().getConfiguration().hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO)))
         {
             scrollMoveButtons();
         }
-        else if (Account.ScrollButtons.NEVER == scrollMoveButtons)
+        else
         {
             staticMoveButtons();
         }
-        else   // Account.ScrollButtons.KEYBOARD_AVAIL
-        {
-            if (this.getResources().getConfiguration().hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO)
-            {
-                scrollMoveButtons();
-            }
-            else
-            {
-                staticMoveButtons();
-            }
-        }
-
         if (!mAccount.getEnableMoveButtons())
         {
             View buttons = findViewById(R.id.move_buttons);