diff options
| author | Tony Mantler <nicoya@google.com> | 2013-09-19 23:04:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-19 23:04:24 +0000 |
| commit | ab4eadaf4d51bfd44d504f55595e7aaba881de6c (patch) | |
| tree | 50d63bb2670cd15b46e6ae9573b00744814ed2a0 | |
| parent | d89517287493418f3319e94dc4b01408305a7451 (diff) | |
| parent | ef0c53e15f509ddb132db716177282b9182f035b (diff) | |
| download | android_packages_apps_Email-ab4eadaf4d51bfd44d504f55595e7aaba881de6c.tar.gz android_packages_apps_Email-ab4eadaf4d51bfd44d504f55595e7aaba881de6c.tar.bz2 android_packages_apps_Email-ab4eadaf4d51bfd44d504f55595e7aaba881de6c.zip | |
Merge "Fake syncing while we're waiting for the sync to start" into jb-ub-mail-ur10
| -rw-r--r-- | src/com/android/email/provider/EmailProvider.java | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java index c2d4fec80..9c53a0b22 100644 --- a/src/com/android/email/provider/EmailProvider.java +++ b/src/com/android/email/provider/EmailProvider.java @@ -3362,6 +3362,12 @@ public class EmailProvider extends ContentProvider { private final FolderList mFolderList; private final Bundle mExtras = new Bundle(); + /** + * When showing a folder, if it's been at least this long since the last sync, + * force a folder refresh. + */ + private static final long AUTO_REFRESH_INTERVAL_MS = 5 * DateUtils.MINUTE_IN_MILLIS; + public EmailConversationCursor(final Context context, final Cursor cursor, final Folder folder, final long mailboxId) { super(cursor); @@ -3379,8 +3385,16 @@ public class EmailProvider extends ContentProvider { mExtras.putInt(UIProvider.CursorExtraKeys.EXTRA_STATUS, UIProvider.CursorStatus.LOADING); } else if (mailbox.mUiSyncStatus == EmailContent.SYNC_STATUS_NONE) { + if (mailbox.mSyncInterval == 0 && + System.currentTimeMillis() - mailbox.mSyncTime + > AUTO_REFRESH_INTERVAL_MS) { + // This will be syncing momentarily + mExtras.putInt(UIProvider.CursorExtraKeys.EXTRA_STATUS, + UIProvider.CursorStatus.LOADING); + } else { mExtras.putInt(UIProvider.CursorExtraKeys.EXTRA_STATUS, UIProvider.CursorStatus.COMPLETE); + } } else { LogUtils.d(Logging.LOG_TAG, "Unknown mailbox sync status" + mailbox.mUiSyncStatus); @@ -3403,12 +3417,6 @@ public class EmailProvider extends ContentProvider { return mExtras; } - /** - * When showing a folder, if it's been at least this long since the last sync, - * force a folder refresh. - */ - private static final long AUTO_REFRESH_INTERVAL_MS = 5 * DateUtils.MINUTE_IN_MILLIS; - @Override public Bundle respond(Bundle params) { final String setVisibilityKey = |