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

Add logging to v21->v22 upgrade; small cleanup

Browse Source 
Change-Id: I6659998a3ad2490c923061aab5328469c3222e25
This commit is contained in:
Marc Blank 2011-08-02 11:44:41 -07:00
parent c1312ff65f
commit 36aef9fb74
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/email/provider/AccountBackupRestore.java
View File

@ -39,9 +39,6 @@ import android.content.Context;
* impossible to test in the wild.
*/
public class AccountBackupRestore {
// We only need to do this once, so prevent extra work by remembering this...
private static boolean sBackupsChecked = false;
/**
* Backup user Account and HostAuth data into our backup database
*

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

@ -2442,8 +2442,9 @@ outer:
*/
private static final String[] V21_ACCOUNT_PROJECTION =
new String[] {AccountColumns.HOST_AUTH_KEY_RECV};
new String[] {AccountColumns.HOST_AUTH_KEY_RECV, AccountColumns.DISPLAY_NAME};
private static final int V21_ACCOUNT_RECV = 0;
private static final int V21_ACCOUNT_NAME = 1;
private static final String[] V21_HOSTAUTH_PROJECTION =
new String[] {HostAuthColumns.PROTOCOL, HostAuthColumns.LOGIN, HostAuthColumns.PASSWORD};
@ -2481,7 +2482,12 @@ outer:
if (hostAuthCursor.moveToFirst()) {
String protocol = hostAuthCursor.getString(V21_HOSTAUTH_PROTOCOL);
// If this is a pop3 or imap account, create the account manager account
if ("imap".equals(protocol) || "pop3".equals(protocol)) {
if (HostAuth.SCHEME_IMAP.equals(protocol) ||
HostAuth.SCHEME_POP3.equals(protocol)) {
if (Email.DEBUG) {
Log.d(TAG, "Create AccountManager account for " + protocol +
"account: " + accountCursor.getString(V21_ACCOUNT_NAME));
}
createAccountManagerAccount(accountManagerContext,
hostAuthCursor.getString(V21_HOSTAUTH_LOGIN),
hostAuthCursor.getString(V21_HOSTAUTH_PASSWORD));