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

Merge "Clean up logging" into ub-mail-master

Browse Source
This commit is contained in:
Tony Mantler 2014-05-06 18:26:41 +00:00 committed by Android (Google) Code Review
commit 4f1014fa10
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,6 @@ import android.provider.SyncStateContract;
import android.text.TextUtils; import android.text.TextUtils;
import com.android.email.R; import com.android.email.R;
import com.android.emailcommon.Logging;
import com.android.emailcommon.provider.Account; import com.android.emailcommon.provider.Account;
import com.android.emailcommon.provider.EmailContent; import com.android.emailcommon.provider.EmailContent;
import com.android.emailcommon.provider.EmailContent.AccountColumns; import com.android.emailcommon.provider.EmailContent.AccountColumns;
@ -226,7 +225,7 @@ public class EmailServiceUtils {
info = getServiceInfo(context, protocol); info = getServiceInfo(context, protocol);
} }
if (info == null) { if (info == null) {
LogUtils.w(Logging.LOG_TAG, "Returning NullService for " + protocol); LogUtils.w(LogUtils.TAG, "Returning NullService for %s", protocol);
return new EmailServiceProxy(context, NullService.class); return new EmailServiceProxy(context, NullService.class);
} else { } else {
return getServiceFromInfo(context, info); return getServiceFromInfo(context, info);
@ -261,11 +260,11 @@ public class EmailServiceUtils {
// here, as there is nothing to actually do about them. // here, as there is nothing to actually do about them.
future.getResult(); future.getResult();
} catch (OperationCanceledException e) { } catch (OperationCanceledException e) {
LogUtils.w(Logging.LOG_TAG, e.toString()); LogUtils.w(LogUtils.TAG, e, "finishAccountManagerBlocker");
} catch (AuthenticatorException e) { } catch (AuthenticatorException e) {
LogUtils.w(Logging.LOG_TAG, e.toString()); LogUtils.w(LogUtils.TAG, e, "finishAccountManagerBlocker");
} catch (IOException e) { } catch (IOException e) {
LogUtils.w(Logging.LOG_TAG, e.toString()); LogUtils.w(LogUtils.TAG, e, "finishAccountManagerBlocker");
} }
} }
@ -323,8 +322,7 @@ public class EmailServiceUtils {
return; return;
} }
LogUtils.w(Logging.LOG_TAG, "Converting " + amAccount.name + " to " LogUtils.w(LogUtils.TAG, "Converting %s to %s", amAccount.name, newProtocol);
+ newProtocol);
final ContentValues accountValues = new ContentValues(); final ContentValues accountValues = new ContentValues();
int oldFlags = account.mFlags; int oldFlags = account.mFlags;
@ -341,7 +339,7 @@ public class EmailServiceUtils {
hostValues.put(HostAuthColumns.PROTOCOL, newProtocol); hostValues.put(HostAuthColumns.PROTOCOL, newProtocol);
resolver.update(ContentUris.withAppendedId(HostAuth.CONTENT_URI, hostAuth.mId), resolver.update(ContentUris.withAppendedId(HostAuth.CONTENT_URI, hostAuth.mId),
hostValues, null, null); hostValues, null, null);
LogUtils.w(Logging.LOG_TAG, "Updated HostAuths"); LogUtils.w(LogUtils.TAG, "Updated HostAuths");
try { try {
// Get current settings for the existing AccountManager account // Get current settings for the existing AccountManager account
@ -356,8 +354,8 @@ public class EmailServiceUtils {
ContactsContract.AUTHORITY); ContactsContract.AUTHORITY);
final boolean calendar = ContentResolver.getSyncAutomatically(amAccount, final boolean calendar = ContentResolver.getSyncAutomatically(amAccount,
CalendarContract.AUTHORITY); CalendarContract.AUTHORITY);
LogUtils.w(Logging.LOG_TAG, "Email: " + email + ", Contacts: " + contacts + "," LogUtils.w(LogUtils.TAG, "Email: %s, Contacts: %s Calendar: %s",
+ " Calendar: " + calendar); email, contacts, calendar);
// Get sync keys for calendar/contacts // Get sync keys for calendar/contacts
final String amName = amAccount.name; final String amName = amAccount.name;
@ -370,7 +368,7 @@ public class EmailServiceUtils {
asCalendarSyncAdapter(SyncState.CONTENT_URI, amName, oldType), asCalendarSyncAdapter(SyncState.CONTENT_URI, amName, oldType),
new android.accounts.Account(amName, oldType)); new android.accounts.Account(amName, oldType));
} catch (RemoteException e) { } catch (RemoteException e) {
LogUtils.w(Logging.LOG_TAG, "Get calendar key FAILED"); LogUtils.w(LogUtils.TAG, "Get calendar key FAILED");
} finally { } finally {
client.release(); client.release();
} }
@ -382,24 +380,24 @@ public class EmailServiceUtils {
ContactsContract.SyncState.CONTENT_URI, ContactsContract.SyncState.CONTENT_URI,
new android.accounts.Account(amName, oldType)); new android.accounts.Account(amName, oldType));
} catch (RemoteException e) { } catch (RemoteException e) {
LogUtils.w(Logging.LOG_TAG, "Get contacts key FAILED"); LogUtils.w(LogUtils.TAG, "Get contacts key FAILED");
} finally { } finally {
client.release(); client.release();
} }
if (calendarSyncKey != null) { if (calendarSyncKey != null) {
LogUtils.w(Logging.LOG_TAG, "Got calendar key: " LogUtils.w(LogUtils.TAG, "Got calendar key: %s",
+ new String(calendarSyncKey)); new String(calendarSyncKey));
} }
if (contactsSyncKey != null) { if (contactsSyncKey != null) {
LogUtils.w(Logging.LOG_TAG, "Got contacts key: " LogUtils.w(LogUtils.TAG, "Got contacts key: %s",
+ new String(contactsSyncKey)); new String(contactsSyncKey));
} }
// Set up a new AccountManager account with new type and old settings // Set up a new AccountManager account with new type and old settings
AccountManagerFuture<?> amFuture = setupAccountManagerAccount(context, account, AccountManagerFuture<?> amFuture = setupAccountManagerAccount(context, account,
email, calendar, contacts, null); email, calendar, contacts, null);
finishAccountManagerBlocker(amFuture); finishAccountManagerBlocker(amFuture);
LogUtils.w(Logging.LOG_TAG, "Created new AccountManager account"); LogUtils.w(LogUtils.TAG, "Created new AccountManager account");
// TODO: Clean up how we determine the type. // TODO: Clean up how we determine the type.
final String accountType = protocolMap.get(hostAuth.mProtocol + "_type"); final String accountType = protocolMap.get(hostAuth.mProtocol + "_type");
@ -412,7 +410,7 @@ public class EmailServiceUtils {
amFuture = AccountManager.get(context) amFuture = AccountManager.get(context)
.removeAccount(amAccount, null, null); .removeAccount(amAccount, null, null);
finishAccountManagerBlocker(amFuture); finishAccountManagerBlocker(amFuture);
LogUtils.w(Logging.LOG_TAG, "Deleted old AccountManager account"); LogUtils.w(LogUtils.TAG, "Deleted old AccountManager account");
// Restore sync keys for contacts/calendar // Restore sync keys for contacts/calendar
@ -426,9 +424,9 @@ public class EmailServiceUtils {
accountType), accountType),
new android.accounts.Account(amName, accountType), new android.accounts.Account(amName, accountType),
calendarSyncKey); calendarSyncKey);
LogUtils.w(Logging.LOG_TAG, "Set calendar key..."); LogUtils.w(LogUtils.TAG, "Set calendar key...");
} catch (RemoteException e) { } catch (RemoteException e) {
LogUtils.w(Logging.LOG_TAG, "Set calendar key FAILED"); LogUtils.w(LogUtils.TAG, "Set calendar key FAILED");
} finally { } finally {
client.release(); client.release();
} }
@ -442,19 +440,19 @@ public class EmailServiceUtils {
ContactsContract.SyncState.CONTENT_URI, ContactsContract.SyncState.CONTENT_URI,
new android.accounts.Account(amName, accountType), new android.accounts.Account(amName, accountType),
contactsSyncKey); contactsSyncKey);
LogUtils.w(Logging.LOG_TAG, "Set contacts key..."); LogUtils.w(LogUtils.TAG, "Set contacts key...");
} catch (RemoteException e) { } catch (RemoteException e) {
LogUtils.w(Logging.LOG_TAG, "Set contacts key FAILED"); LogUtils.w(LogUtils.TAG, "Set contacts key FAILED");
} }
} }
// That's all folks! // That's all folks!
LogUtils.w(Logging.LOG_TAG, "Account update completed."); LogUtils.w(LogUtils.TAG, "Account update completed.");
} finally { } finally {
// Clear the incomplete flag on the provider account // Clear the incomplete flag on the provider account
accountValues.put(AccountColumns.FLAGS, oldFlags); accountValues.put(AccountColumns.FLAGS, oldFlags);
resolver.update(accountUri, accountValues, null, null); resolver.update(accountUri, accountValues, null, null);
LogUtils.w(Logging.LOG_TAG, "[Incomplete flag cleared]"); LogUtils.w(LogUtils.TAG, "[Incomplete flag cleared]");
} }
} }
} finally { } finally {