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

astyle

Browse Source
This commit is contained in:
Jesse Vincent 2011-01-23 00:56:01 +00:00
parent c06643bd47
commit 098851684f
2 changed files with 49 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -342,48 +342,53 @@ public class ChooseFolder extends K9ListActivity
}); });
mAdapter.setNotifyOnChange(false); mAdapter.setNotifyOnChange(false);
int selectedFolder = -1; int selectedFolder = -1;
try { try
mAdapter.clear(); {
int position = 0; mAdapter.clear();
for (String name : localFolders) int position = 0;
{ for (String name : localFolders)
if (K9.INBOX.equalsIgnoreCase(name)) {
{ if (K9.INBOX.equalsIgnoreCase(name))
mAdapter.add(getString(R.string.special_mailbox_name_inbox)); {
heldInbox = name; mAdapter.add(getString(R.string.special_mailbox_name_inbox));
} heldInbox = name;
else if (!K9.ERROR_FOLDER_NAME.equals(name)) }
{ else if (!K9.ERROR_FOLDER_NAME.equals(name))
mAdapter.add(name); {
} mAdapter.add(name);
}
if (mSelectFolder != null) if (mSelectFolder != null)
{ {
/* /*
* Never select EXTRA_CUR_FOLDER (mFolder) if EXTRA_SEL_FOLDER * Never select EXTRA_CUR_FOLDER (mFolder) if EXTRA_SEL_FOLDER
* (mSelectedFolder) was provided. * (mSelectedFolder) was provided.
*/ */
if (name.equals(mSelectFolder)) if (name.equals(mSelectFolder))
{ {
selectedFolder = position; selectedFolder = position;
} }
} }
else if (name.equals(mFolder) || else if (name.equals(mFolder) ||
(K9.INBOX.equalsIgnoreCase(mFolder) && K9.INBOX.equalsIgnoreCase(name))) (K9.INBOX.equalsIgnoreCase(mFolder) && K9.INBOX.equalsIgnoreCase(name)))
{ {
selectedFolder = position; selectedFolder = position;
} }
position++; position++;
} }
} finally { }
mAdapter.setNotifyOnChange(true); finally
runOnUiThread(new Runnable() { {
public void run() { mAdapter.setNotifyOnChange(true);
// runOnUiThread( runOnUiThread(new Runnable()
mAdapter.notifyDataSetChanged(); {
} public void run()
}); {
// runOnUiThread(
mAdapter.notifyDataSetChanged();
}
});
} }
mHandler.dataChanged(); mHandler.dataChanged();

6
src/com/fsck/k9/view/ToggleScrollView.java
View File

@ -31,7 +31,8 @@ public class ToggleScrollView extends ScrollView
@Override @Override
public boolean onInterceptTouchEvent(MotionEvent ev) public boolean onInterceptTouchEvent(MotionEvent ev)
{ {
if(!mScrolling) { if(!mScrolling)
{
return false; return false;
} }
@ -63,7 +64,8 @@ public class ToggleScrollView extends ScrollView
{ {
return false; return false;
} }
} catch (Exception e) }
catch (Exception e)
{ {
// nothing // nothing
} }