moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

cut down a couple overly verbose conditionals

This commit is contained in:
Jesse Vincent 2010-12-26 03:49:06 +00:00
parent daf5a9d704
commit 877427f110
1 changed files with 11 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/com/fsck/k9/activity/MessageView.java
View File

@ -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);