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

am b3be4655: Merge "Sync account immediately upon restore" into ub-gmail-ur14-dev

Browse Source 
* commit 'b3be4655a88d2289abf355f3d41dc9a4b5a5052d':
  Sync account immediately upon restore
This commit is contained in:
Tony Mantler 2014-11-02 15:32:34 +00:00 committed by Android Git Automerger
commit 65d130ad2c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/email/provider/EmailProvider.java
View File

@ -1631,14 +1631,18 @@ public class EmailProvider extends ContentProvider
// Try to restore them from saved JSON // Try to restore them from saved JSON
int restoredCount = 0; int restoredCount = 0;
for (final android.accounts.Account amAccount : amAccounts) { for (final android.accounts.Account amAccount : amAccounts) {
String jsonString = null; final String jsonString = am.getUserData(amAccount, ACCOUNT_MANAGER_JSON_TAG);
jsonString = am.getUserData(amAccount, ACCOUNT_MANAGER_JSON_TAG);
if (TextUtils.isEmpty(jsonString)) { if (TextUtils.isEmpty(jsonString)) {
continue; continue;
} }
final Account account = Account.fromJsonString(jsonString); final Account account = Account.fromJsonString(jsonString);
if (account != null) { if (account != null) {
AccountSettingsUtils.commitSettings(context, account); AccountSettingsUtils.commitSettings(context, account);
final Bundle extras = new Bundle(3);
extras.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
extras.putBoolean(ContentResolver.SYNC_EXTRAS_DO_NOT_RETRY, true);
extras.putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true);
ContentResolver.requestSync(amAccount, EmailContent.AUTHORITY, extras);
restoredCount++; restoredCount++;
} }
} }