ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am b915c3c0: Merge "Skip security check when account id is unknown." into froyo

Browse Source 
Merge commit 'b915c3c018c8c4ba063514c3bd9ce05d3f08aa93' into froyo-plus-aosp

* commit 'b915c3c018c8c4ba063514c3bd9ce05d3f08aa93':
  Skip security check when account id is unknown.
This commit is contained in:
Andy Stadler 2010-04-28 09:32:10 -07:00 committed by Android Git Automerger
commit 78d3c6022c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/email/activity/MessageList.java
View File

@ -1091,7 +1091,7 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
@Override
protected Long doInBackground(Void... params) {
// Quick check that account is not in security hold
if (isSecurityHold(mAccountId)) {
if (mAccountId != -1 && isSecurityHold(mAccountId)) {
showSecurityActivity = true;
return Long.valueOf(-1);
}
@ -1600,7 +1600,7 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
// How long we want to wait for refreshes (a good starting guess)
// I suspect this could be lowered down to even 1000 or so, but this seems ok for now
private static final long REFRESH_INTERVAL_MS = 2500;
private java.text.DateFormat mDateFormat;
private java.text.DateFormat mTimeFormat;