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

Merge "Clear exchange sync keys upon app upgrade" into jb-ub-mail-ur10

Browse Source
This commit is contained in:
Martin Hibdon 2013-09-18 19:09:14 +00:00 committed by Android (Google) Code Review
commit ed60a4026b
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/email/service/EmailServiceUtils.java
View File

@ -403,6 +403,12 @@ public class EmailServiceUtils {
finishAccountManagerBlocker(amFuture);
LogUtils.w(Logging.LOG_TAG, "Created new AccountManager account");
// XXX:
// It would be nice if we could copy or move all of the old account's data over
// to the new account here. b/10805685
// Delete the AccountManager account
amFuture = AccountManager.get(context)
.removeAccount(amAccount, null, null);
@ -410,6 +416,10 @@ public class EmailServiceUtils {
LogUtils.w(Logging.LOG_TAG, "Deleted old AccountManager account");
// Restore sync keys for contacts/calendar
// XXX See b/10211620
// Disable this for now. We want to clear the sync keys so that the next
// sync will get everything.
/*
// TODO: Clean up how we determine the type.
final String accountType = protocolMap.get(hostAuth.mProtocol + "_type");
if (accountType != null &&
@ -443,6 +453,7 @@ public class EmailServiceUtils {
LogUtils.w(Logging.LOG_TAG, "Set contacts key FAILED");
}
}
*/
// That's all folks!
LogUtils.w(Logging.LOG_TAG, "Account update completed.");