moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-12 05:00:20 -05:00
Code Issues Releases Wiki Activity

Rename class members

Browse Source
This commit is contained in:
cketti 2012-10-31 01:49:11 +01:00
parent 08b361ed36
commit 60bf3e7e29
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/fsck/k9/activity/Accounts.java
View File

@ -80,9 +80,6 @@ import com.fsck.k9.mail.store.WebDavStore;
import com.fsck.k9.search.LocalSearch; import com.fsck.k9.search.LocalSearch;
import com.fsck.k9.search.SearchAccount; import com.fsck.k9.search.SearchAccount;
import com.fsck.k9.search.SearchModifier; import com.fsck.k9.search.SearchModifier;
import com.fsck.k9.search.SearchSpecification;
import com.fsck.k9.search.SearchSpecification.Attribute;
import com.fsck.k9.search.SearchSpecification.Searchfield;
import com.fsck.k9.view.ColorChip; import com.fsck.k9.view.ColorChip;
import com.fsck.k9.preferences.SettingsExporter; import com.fsck.k9.preferences.SettingsExporter;
import com.fsck.k9.preferences.SettingsImportExportException; import com.fsck.k9.preferences.SettingsImportExportException;
@ -129,8 +126,8 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
private AccountsHandler mHandler = new AccountsHandler(); private AccountsHandler mHandler = new AccountsHandler();
private AccountsAdapter mAdapter; private AccountsAdapter mAdapter;
private SearchAccount unreadAccount = null; private SearchAccount mAllMessagesAccount = null;
private SearchAccount integratedInboxAccount = null; private SearchAccount mUnifiedInboxAccount = null;
private FontSizes mFontSizes = K9.getFontSizes(); private FontSizes mFontSizes = K9.getFontSizes();
private MenuItem mRefreshMenuItem; private MenuItem mRefreshMenuItem;
@ -378,7 +375,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
boolean startup = intent.getBooleanExtra(EXTRA_STARTUP, true); boolean startup = intent.getBooleanExtra(EXTRA_STARTUP, true);
if (startup && K9.startIntegratedInbox() && !K9.isHideSpecialAccounts()) { if (startup && K9.startIntegratedInbox() && !K9.isHideSpecialAccounts()) {
onOpenAccount(integratedInboxAccount); onOpenAccount(mUnifiedInboxAccount);
finish(); finish();
return; return;
} else if (startup && accounts.length == 1 && onOpenAccount(accounts[0])) { } else if (startup && accounts.length == 1 && onOpenAccount(accounts[0])) {
@ -427,8 +424,8 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
* Creates and initializes the special accounts ('Unified Inbox' and 'All Messages') * Creates and initializes the special accounts ('Unified Inbox' and 'All Messages')
*/ */
private void createSpecialAccounts() { private void createSpecialAccounts() {
integratedInboxAccount = SearchAccount.createUnifiedInboxAccount(this); mUnifiedInboxAccount = SearchAccount.createUnifiedInboxAccount(this);
unreadAccount = SearchAccount.createAllMessagesAccount(this); mAllMessagesAccount = SearchAccount.createAllMessagesAccount(this);
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@ -522,14 +519,14 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
List<BaseAccount> newAccounts; List<BaseAccount> newAccounts;
if (!K9.isHideSpecialAccounts() && accounts.length > 0) { if (!K9.isHideSpecialAccounts() && accounts.length > 0) {
if (integratedInboxAccount == null || unreadAccount == null) { if (mUnifiedInboxAccount == null || mAllMessagesAccount == null) {
createSpecialAccounts(); createSpecialAccounts();
} }
newAccounts = new ArrayList<BaseAccount>(accounts.length + newAccounts = new ArrayList<BaseAccount>(accounts.length +
SPECIAL_ACCOUNTS_COUNT); SPECIAL_ACCOUNTS_COUNT);
newAccounts.add(integratedInboxAccount); newAccounts.add(mUnifiedInboxAccount);
newAccounts.add(unreadAccount); newAccounts.add(mAllMessagesAccount);
} else { } else {
newAccounts = new ArrayList<BaseAccount>(accounts.length); newAccounts = new ArrayList<BaseAccount>(accounts.length);
} }