Merge "Skip security check when account id is unknown." into froyo
This commit is contained in:
commit
b915c3c018
@ -1091,7 +1091,7 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
|
|||||||
@Override
|
@Override
|
||||||
protected Long doInBackground(Void... params) {
|
protected Long doInBackground(Void... params) {
|
||||||
// Quick check that account is not in security hold
|
// Quick check that account is not in security hold
|
||||||
if (isSecurityHold(mAccountId)) {
|
if (mAccountId != -1 && isSecurityHold(mAccountId)) {
|
||||||
showSecurityActivity = true;
|
showSecurityActivity = true;
|
||||||
return Long.valueOf(-1);
|
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)
|
// 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
|
// 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 static final long REFRESH_INTERVAL_MS = 2500;
|
||||||
|
|
||||||
private java.text.DateFormat mDateFormat;
|
private java.text.DateFormat mDateFormat;
|
||||||
private java.text.DateFormat mTimeFormat;
|
private java.text.DateFormat mTimeFormat;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user