moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-12-25 00:58:50 -05:00
Code Issues Releases Wiki Activity

Prefixed instance variables with "m" to comply with K-9 code style

Browse Source
This commit is contained in:
cketti 2012-03-18 21:51:01 +01:00
parent 09bc07596e
commit b7c1f8ab2f
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/com/fsck/k9/activity/ChooseFolder.java
View File

@ -42,10 +42,10 @@ public class ChooseFolder extends K9ListActivity {
MessageReference mMessageReference; MessageReference mMessageReference;
ArrayAdapter<String> mAdapter; ArrayAdapter<String> mAdapter;
private ChooseFolderHandler mHandler = new ChooseFolderHandler(); private ChooseFolderHandler mHandler = new ChooseFolderHandler();
String heldInbox = null; String mHeldInbox = null;
boolean hideCurrentFolder = true; boolean mHideCurrentFolder = true;
boolean showOptionNone = false; boolean mShowOptionNone = false;
boolean showDisplayableOnly = false; boolean mShowDisplayableOnly = false;
/** /**
* What folders to display.<br/> * What folders to display.<br/>
@ -59,7 +59,7 @@ public class ChooseFolder extends K9ListActivity {
* Created on the fly and invalidated if a new * Created on the fly and invalidated if a new
* set of folders is chosen via {@link #onOptionsItemSelected(MenuItem)} * set of folders is chosen via {@link #onOptionsItemSelected(MenuItem)}
*/ */
private FolderListFilter<String> myFilter = null; private FolderListFilter<String> mMyFilter = null;
public static final String EXTRA_ACCOUNT = "com.fsck.k9.ChooseFolder_account"; public static final String EXTRA_ACCOUNT = "com.fsck.k9.ChooseFolder_account";
public static final String EXTRA_CUR_FOLDER = "com.fsck.k9.ChooseFolder_curfolder"; public static final String EXTRA_CUR_FOLDER = "com.fsck.k9.ChooseFolder_curfolder";
@ -85,13 +85,13 @@ public class ChooseFolder extends K9ListActivity {
mFolder = intent.getStringExtra(EXTRA_CUR_FOLDER); mFolder = intent.getStringExtra(EXTRA_CUR_FOLDER);
mSelectFolder = intent.getStringExtra(EXTRA_SEL_FOLDER); mSelectFolder = intent.getStringExtra(EXTRA_SEL_FOLDER);
if (intent.getStringExtra(EXTRA_SHOW_CURRENT) != null) { if (intent.getStringExtra(EXTRA_SHOW_CURRENT) != null) {
hideCurrentFolder = false; mHideCurrentFolder = false;
} }
if (intent.getStringExtra(EXTRA_SHOW_FOLDER_NONE) != null) { if (intent.getStringExtra(EXTRA_SHOW_FOLDER_NONE) != null) {
showOptionNone = true; mShowOptionNone = true;
} }
if (intent.getStringExtra(EXTRA_SHOW_DISPLAYABLE_ONLY) != null) { if (intent.getStringExtra(EXTRA_SHOW_DISPLAYABLE_ONLY) != null) {
showDisplayableOnly = true; mShowDisplayableOnly = true;
} }
if (mFolder == null) if (mFolder == null)
mFolder = ""; mFolder = "";
@ -121,8 +121,8 @@ public class ChooseFolder extends K9ListActivity {
intent.putExtra(EXTRA_ACCOUNT, mAccount.getUuid()); intent.putExtra(EXTRA_ACCOUNT, mAccount.getUuid());
intent.putExtra(EXTRA_CUR_FOLDER, mFolder); intent.putExtra(EXTRA_CUR_FOLDER, mFolder);
String destFolderName = (String)((TextView)view).getText(); String destFolderName = (String)((TextView)view).getText();
if (heldInbox != null && getString(R.string.special_mailbox_name_inbox).equals(destFolderName)) { if (mHeldInbox != null && getString(R.string.special_mailbox_name_inbox).equals(destFolderName)) {
destFolderName = heldInbox; destFolderName = mHeldInbox;
} }
intent.putExtra(EXTRA_NEW_FOLDER, destFolderName); intent.putExtra(EXTRA_NEW_FOLDER, destFolderName);
intent.putExtra(EXTRA_MESSAGE, mMessageReference); intent.putExtra(EXTRA_MESSAGE, mMessageReference);
@ -277,8 +277,8 @@ public class ChooseFolder extends K9ListActivity {
private void setDisplayMode(FolderMode aMode) { private void setDisplayMode(FolderMode aMode) {
mMode = aMode; mMode = aMode;
// invalidate the current filter as it is working on an inval // invalidate the current filter as it is working on an inval
if (myFilter != null) { if (mMyFilter != null) {
myFilter.invalidate(); mMyFilter.invalidate();
} }
//re-populate the list //re-populate the list
MessagingController.getInstance(getApplication()).listFolders(mAccount, MessagingController.getInstance(getApplication()).listFolders(mAccount,
@ -322,7 +322,7 @@ public class ChooseFolder extends K9ListActivity {
String name = folder.getName(); String name = folder.getName();
// Inbox needs to be compared case-insensitively // Inbox needs to be compared case-insensitively
if (hideCurrentFolder && (name.equals(mFolder) || if (mHideCurrentFolder && (name.equals(mFolder) ||
(mAccount.getInboxFolderName().equalsIgnoreCase(mFolder) && mAccount.getInboxFolderName().equalsIgnoreCase(name)))) { (mAccount.getInboxFolderName().equalsIgnoreCase(mFolder) && mAccount.getInboxFolderName().equalsIgnoreCase(name)))) {
continue; continue;
} }
@ -345,7 +345,7 @@ public class ChooseFolder extends K9ListActivity {
} }
if (showOptionNone) { if (mShowOptionNone) {
localFolders.add(K9.FOLDER_NONE); localFolders.add(K9.FOLDER_NONE);
} }
@ -379,7 +379,7 @@ public class ChooseFolder extends K9ListActivity {
for (String name : localFolders) { for (String name : localFolders) {
if (mAccount.getInboxFolderName().equalsIgnoreCase(name)) { if (mAccount.getInboxFolderName().equalsIgnoreCase(name)) {
folderList.add(getString(R.string.special_mailbox_name_inbox)); folderList.add(getString(R.string.special_mailbox_name_inbox));
heldInbox = name; mHeldInbox = name;
} else if (!K9.ERROR_FOLDER_NAME.equals(name) && !account.getOutboxFolderName().equals(name)) { } else if (!K9.ERROR_FOLDER_NAME.equals(name) && !account.getOutboxFolderName().equals(name)) {
folderList.add(name); folderList.add(name);
} }