Support move of Account to its own top-level class
Change-Id: Ibf427ddcfb0566354ea169997c56a67de1897c0b
diff --git a/src/com/android/exchange/AbstractSyncService.java b/src/com/android/exchange/AbstractSyncService.java
index 93d2960..5562302 100644
--- a/src/com/android/exchange/AbstractSyncService.java
+++ b/src/com/android/exchange/AbstractSyncService.java
@@ -18,7 +18,7 @@
package com.android.exchange;
import com.android.emailcommon.mail.MessagingException;
-import com.android.emailcommon.provider.EmailContent.Account;
+import com.android.emailcommon.provider.Account;
import com.android.emailcommon.provider.Mailbox;
import com.android.exchange.utility.FileLogger;
diff --git a/src/com/android/exchange/CalendarSyncAdapterService.java b/src/com/android/exchange/CalendarSyncAdapterService.java
index d89b9a8..58cd99e 100644
--- a/src/com/android/exchange/CalendarSyncAdapterService.java
+++ b/src/com/android/exchange/CalendarSyncAdapterService.java
@@ -16,11 +16,6 @@
package com.android.exchange;
-import com.android.emailcommon.provider.EmailContent;
-import com.android.emailcommon.provider.EmailContent.AccountColumns;
-import com.android.emailcommon.provider.EmailContent.MailboxColumns;
-import com.android.emailcommon.provider.Mailbox;
-
import android.accounts.Account;
import android.accounts.OperationCanceledException;
import android.app.Service;
@@ -36,6 +31,11 @@
import android.provider.Calendar.Events;
import android.util.Log;
+import com.android.emailcommon.provider.EmailContent;
+import com.android.emailcommon.provider.EmailContent.AccountColumns;
+import com.android.emailcommon.provider.EmailContent.MailboxColumns;
+import com.android.emailcommon.provider.Mailbox;
+
public class CalendarSyncAdapterService extends Service {
private static final String TAG = "EAS CalendarSyncAdapterService";
private static SyncAdapterImpl sSyncAdapter = null;
@@ -116,7 +116,7 @@
// Find the (EmailProvider) account associated with this email address
Cursor accountCursor =
- cr.query(EmailContent.Account.CONTENT_URI,
+ cr.query(com.android.emailcommon.provider.Account.CONTENT_URI,
EmailContent.ID_PROJECTION, AccountColumns.EMAIL_ADDRESS + "=?",
new String[] {account.name}, null);
try {
diff --git a/src/com/android/exchange/ContactsSyncAdapterService.java b/src/com/android/exchange/ContactsSyncAdapterService.java
index a54c1a2..97706e7 100644
--- a/src/com/android/exchange/ContactsSyncAdapterService.java
+++ b/src/com/android/exchange/ContactsSyncAdapterService.java
@@ -128,7 +128,7 @@
// Find the (EmailProvider) account associated with this email address
Cursor accountCursor =
- cr.query(com.android.emailcommon.provider.EmailContent.Account.CONTENT_URI, ID_PROJECTION,
+ cr.query(com.android.emailcommon.provider.Account.CONTENT_URI, ID_PROJECTION,
AccountColumns.EMAIL_ADDRESS + "=?", new String[] {account.name}, null);
try {
if (accountCursor.moveToFirst()) {
diff --git a/src/com/android/exchange/EasOutboxService.java b/src/com/android/exchange/EasOutboxService.java
index 147bdb5..d60b577 100644
--- a/src/com/android/exchange/EasOutboxService.java
+++ b/src/com/android/exchange/EasOutboxService.java
@@ -19,7 +19,7 @@
import com.android.emailcommon.internet.Rfc822Output;
import com.android.emailcommon.mail.MessagingException;
-import com.android.emailcommon.provider.EmailContent.Account;
+import com.android.emailcommon.provider.Account;
import com.android.emailcommon.provider.EmailContent.Body;
import com.android.emailcommon.provider.EmailContent.BodyColumns;
import com.android.emailcommon.provider.EmailContent.MailboxColumns;
diff --git a/src/com/android/exchange/EasSyncService.java b/src/com/android/exchange/EasSyncService.java
index 16f3031..35fc394 100644
--- a/src/com/android/exchange/EasSyncService.java
+++ b/src/com/android/exchange/EasSyncService.java
@@ -21,7 +21,7 @@
import com.android.emailcommon.mail.MeetingInfo;
import com.android.emailcommon.mail.MessagingException;
import com.android.emailcommon.mail.PackedString;
-import com.android.emailcommon.provider.EmailContent.Account;
+import com.android.emailcommon.provider.Account;
import com.android.emailcommon.provider.EmailContent.AccountColumns;
import com.android.emailcommon.provider.EmailContent.MailboxColumns;
import com.android.emailcommon.provider.EmailContent.Message;
diff --git a/src/com/android/exchange/EmailSyncAdapterService.java b/src/com/android/exchange/EmailSyncAdapterService.java
index 9219b21..f91ee13 100644
--- a/src/com/android/exchange/EmailSyncAdapterService.java
+++ b/src/com/android/exchange/EmailSyncAdapterService.java
@@ -94,7 +94,7 @@
// Find the (EmailProvider) account associated with this email address
Cursor accountCursor =
- cr.query(com.android.emailcommon.provider.EmailContent.Account.CONTENT_URI,
+ cr.query(com.android.emailcommon.provider.Account.CONTENT_URI,
ID_PROJECTION, AccountColumns.EMAIL_ADDRESS + "=?", new String[] {account.name},
null);
try {
diff --git a/src/com/android/exchange/ExchangeService.java b/src/com/android/exchange/ExchangeService.java
index f79188e..c970694 100644
--- a/src/com/android/exchange/ExchangeService.java
+++ b/src/com/android/exchange/ExchangeService.java
@@ -19,8 +19,8 @@
import com.android.emailcommon.Api;
import com.android.emailcommon.TempDirectory;
+import com.android.emailcommon.provider.Account;
import com.android.emailcommon.provider.EmailContent;
-import com.android.emailcommon.provider.EmailContent.Account;
import com.android.emailcommon.provider.EmailContent.Attachment;
import com.android.emailcommon.provider.EmailContent.HostAuthColumns;
import com.android.emailcommon.provider.EmailContent.MailboxColumns;
diff --git a/src/com/android/exchange/SecurityPolicyDelegate.java b/src/com/android/exchange/SecurityPolicyDelegate.java
index 422f77e..5025c8f 100644
--- a/src/com/android/exchange/SecurityPolicyDelegate.java
+++ b/src/com/android/exchange/SecurityPolicyDelegate.java
@@ -16,7 +16,7 @@
package com.android.exchange;
-import com.android.emailcommon.provider.EmailContent.Account;
+import com.android.emailcommon.provider.Account;
import com.android.emailcommon.provider.Policy;
import com.android.emailcommon.service.PolicyServiceProxy;
diff --git a/src/com/android/exchange/adapter/AbstractSyncAdapter.java b/src/com/android/exchange/adapter/AbstractSyncAdapter.java
index bd58b35..b4c3c78 100644
--- a/src/com/android/exchange/adapter/AbstractSyncAdapter.java
+++ b/src/com/android/exchange/adapter/AbstractSyncAdapter.java
@@ -17,7 +17,7 @@
package com.android.exchange.adapter;
-import com.android.emailcommon.provider.EmailContent.Account;
+import com.android.emailcommon.provider.Account;
import com.android.emailcommon.provider.Mailbox;
import com.android.exchange.CommandStatusException;
import com.android.exchange.Eas;
diff --git a/src/com/android/exchange/adapter/AbstractSyncParser.java b/src/com/android/exchange/adapter/AbstractSyncParser.java
index c373c2b..d2bb6e0 100644
--- a/src/com/android/exchange/adapter/AbstractSyncParser.java
+++ b/src/com/android/exchange/adapter/AbstractSyncParser.java
@@ -17,7 +17,7 @@
package com.android.exchange.adapter;
-import com.android.emailcommon.provider.EmailContent.Account;
+import com.android.emailcommon.provider.Account;
import com.android.emailcommon.provider.EmailContent.MailboxColumns;
import com.android.emailcommon.provider.Mailbox;
import com.android.exchange.CommandStatusException;
diff --git a/src/com/android/exchange/adapter/FolderSyncParser.java b/src/com/android/exchange/adapter/FolderSyncParser.java
index 26ebdb5..c05ed1b 100644
--- a/src/com/android/exchange/adapter/FolderSyncParser.java
+++ b/src/com/android/exchange/adapter/FolderSyncParser.java
@@ -17,8 +17,8 @@
package com.android.exchange.adapter;
+import com.android.emailcommon.provider.Account;
import com.android.emailcommon.provider.EmailContent;
-import com.android.emailcommon.provider.EmailContent.Account;
import com.android.emailcommon.provider.EmailContent.AccountColumns;
import com.android.emailcommon.provider.EmailContent.MailboxColumns;
import com.android.emailcommon.provider.Mailbox;
diff --git a/src/com/android/exchange/provider/ExchangeDirectoryProvider.java b/src/com/android/exchange/provider/ExchangeDirectoryProvider.java
index f037baa..6d725ff 100644
--- a/src/com/android/exchange/provider/ExchangeDirectoryProvider.java
+++ b/src/com/android/exchange/provider/ExchangeDirectoryProvider.java
@@ -18,8 +18,8 @@
import com.android.emailcommon.Configuration;
import com.android.emailcommon.mail.PackedString;
+import com.android.emailcommon.provider.Account;
import com.android.emailcommon.provider.EmailContent;
-import com.android.emailcommon.provider.EmailContent.Account;
import com.android.emailcommon.provider.EmailContent.AccountColumns;
import com.android.emailcommon.service.AccountServiceProxy;
import com.android.emailcommon.utility.Utility;
diff --git a/src/com/android/exchange/provider/MailboxUtilities.java b/src/com/android/exchange/provider/MailboxUtilities.java
index bde9ec9..e7ac061 100644
--- a/src/com/android/exchange/provider/MailboxUtilities.java
+++ b/src/com/android/exchange/provider/MailboxUtilities.java
@@ -17,7 +17,7 @@
package com.android.exchange.provider;
import com.android.emailcommon.Logging;
-import com.android.emailcommon.provider.EmailContent.Account;
+import com.android.emailcommon.provider.Account;
import com.android.emailcommon.provider.EmailContent.MailboxColumns;
import com.android.emailcommon.provider.Mailbox;
diff --git a/src/com/android/exchange/utility/CalendarUtilities.java b/src/com/android/exchange/utility/CalendarUtilities.java
index 952402b..0b676c7 100644
--- a/src/com/android/exchange/utility/CalendarUtilities.java
+++ b/src/com/android/exchange/utility/CalendarUtilities.java
@@ -17,8 +17,8 @@
package com.android.exchange.utility;
import com.android.emailcommon.mail.Address;
+import com.android.emailcommon.provider.Account;
import com.android.emailcommon.provider.EmailContent;
-import com.android.emailcommon.provider.EmailContent.Account;
import com.android.emailcommon.provider.EmailContent.Attachment;
import com.android.emailcommon.provider.EmailContent.Message;
import com.android.emailcommon.provider.Mailbox;
diff --git a/tests/src/com/android/exchange/CalendarSyncEnablerTest.java b/tests/src/com/android/exchange/CalendarSyncEnablerTest.java
index 6d19288..44ade47 100644
--- a/tests/src/com/android/exchange/CalendarSyncEnablerTest.java
+++ b/tests/src/com/android/exchange/CalendarSyncEnablerTest.java
@@ -16,11 +16,6 @@
package com.android.exchange;
-import com.android.emailcommon.AccountManagerTypes;
-import com.android.emailcommon.Logging;
-import com.android.emailcommon.provider.EmailContent;
-import com.android.exchange.utility.ExchangeTestCase;
-
import android.accounts.Account;
import android.accounts.AccountManager;
import android.accounts.AccountManagerFuture;
@@ -36,6 +31,10 @@
import android.text.TextUtils;
import android.util.Log;
+import com.android.emailcommon.AccountManagerTypes;
+import com.android.emailcommon.Logging;
+import com.android.exchange.utility.ExchangeTestCase;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -220,20 +219,24 @@
AccountManager.get(getContext()).addAccountExplicitly(account, "password", null);
}
- protected EmailContent.Account setupProviderAndAccountManagerAccount(String username) {
+ protected com.android.emailcommon.provider.Account
+ setupProviderAndAccountManagerAccount(String username) {
// Note that setupAccount creates the email address username@android.com, so that's what
// we need to use for the account manager
createAccountManagerAccount(username + TEST_ACCOUNT_SUFFIX);
return setupTestAccount(username, true);
}
- protected ArrayList<EmailContent.Account> makeExchangeServiceAccountList() {
- ArrayList<EmailContent.Account> accountList = new ArrayList<EmailContent.Account>();
- Cursor c = mProviderContext.getContentResolver().query(EmailContent.Account.CONTENT_URI,
- EmailContent.Account.CONTENT_PROJECTION, null, null, null);
+ protected ArrayList<com.android.emailcommon.provider.Account> makeExchangeServiceAccountList() {
+ ArrayList<com.android.emailcommon.provider.Account> accountList =
+ new ArrayList<com.android.emailcommon.provider.Account>();
+ Cursor c = mProviderContext.getContentResolver().query(
+ com.android.emailcommon.provider.Account.CONTENT_URI,
+ com.android.emailcommon.provider.Account.CONTENT_PROJECTION, null, null, null);
try {
while (c.moveToNext()) {
- EmailContent.Account account = new EmailContent.Account();
+ com.android.emailcommon.provider.Account account =
+ new com.android.emailcommon.provider.Account();
account.restore(c);
accountList.add(account);
}
diff --git a/tests/src/com/android/exchange/EasSyncServiceTests.java b/tests/src/com/android/exchange/EasSyncServiceTests.java
index c59b9dd..8b0b410 100644
--- a/tests/src/com/android/exchange/EasSyncServiceTests.java
+++ b/tests/src/com/android/exchange/EasSyncServiceTests.java
@@ -17,7 +17,7 @@
package com.android.exchange;
-import com.android.emailcommon.provider.EmailContent.Account;
+import com.android.emailcommon.provider.Account;
import org.apache.http.Header;
import org.apache.http.client.methods.HttpPost;
diff --git a/tests/src/com/android/exchange/ExchangeServiceAccountTests.java b/tests/src/com/android/exchange/ExchangeServiceAccountTests.java
index bde81bd..ae80311 100644
--- a/tests/src/com/android/exchange/ExchangeServiceAccountTests.java
+++ b/tests/src/com/android/exchange/ExchangeServiceAccountTests.java
@@ -17,7 +17,7 @@
package com.android.exchange;
-import com.android.emailcommon.provider.EmailContent.Account;
+import com.android.emailcommon.provider.Account;
import com.android.emailcommon.provider.Mailbox;
import com.android.exchange.ExchangeService.SyncError;
import com.android.exchange.provider.EmailContentSetupUtils;
diff --git a/tests/src/com/android/exchange/adapter/EmailSyncAdapterTests.java b/tests/src/com/android/exchange/adapter/EmailSyncAdapterTests.java
index 8dcde84..6bc946c 100644
--- a/tests/src/com/android/exchange/adapter/EmailSyncAdapterTests.java
+++ b/tests/src/com/android/exchange/adapter/EmailSyncAdapterTests.java
@@ -16,8 +16,8 @@
package com.android.exchange.adapter;
+import com.android.emailcommon.provider.Account;
import com.android.emailcommon.provider.EmailContent;
-import com.android.emailcommon.provider.EmailContent.Account;
import com.android.emailcommon.provider.EmailContent.Body;
import com.android.emailcommon.provider.EmailContent.Message;
import com.android.emailcommon.provider.EmailContent.SyncColumns;
diff --git a/tests/src/com/android/exchange/adapter/SyncAdapterTestCase.java b/tests/src/com/android/exchange/adapter/SyncAdapterTestCase.java
index 189df61..e8553ca 100644
--- a/tests/src/com/android/exchange/adapter/SyncAdapterTestCase.java
+++ b/tests/src/com/android/exchange/adapter/SyncAdapterTestCase.java
@@ -16,16 +16,18 @@
package com.android.exchange.adapter;
-import com.android.emailcommon.provider.EmailContent.Account;
-import com.android.emailcommon.provider.Mailbox;
-import com.android.exchange.EasSyncService;
-import com.android.exchange.adapter.EmailSyncAdapter.EasEmailSyncParser;
-
import android.content.ContentResolver;
import android.content.ContentUris;
import android.content.Context;
import android.test.AndroidTestCase;
+import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.Mailbox;
+import com.android.exchange.EasSyncService;
+import com.android.exchange.adapter.AbstractSyncAdapter;
+import com.android.exchange.adapter.EmailSyncAdapter;
+import com.android.exchange.adapter.EmailSyncAdapter.EasEmailSyncParser;
+
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.lang.reflect.Constructor;
diff --git a/tests/src/com/android/exchange/provider/EmailContentSetupUtils.java b/tests/src/com/android/exchange/provider/EmailContentSetupUtils.java
index 3b364c2..c302b02 100644
--- a/tests/src/com/android/exchange/provider/EmailContentSetupUtils.java
+++ b/tests/src/com/android/exchange/provider/EmailContentSetupUtils.java
@@ -16,8 +16,7 @@
package com.android.exchange.provider;
-import com.android.emailcommon.provider.EmailContent;
-import com.android.emailcommon.provider.EmailContent.Account;
+import com.android.emailcommon.provider.Account;
import com.android.emailcommon.provider.EmailContent.Message;
import com.android.emailcommon.provider.Mailbox;
@@ -70,7 +69,7 @@
box.mAccountKey = accountId;
box.mSyncKey = "sync-key-" + name;
box.mSyncLookback = 2;
- box.mSyncInterval = EmailContent.Account.CHECK_INTERVAL_NEVER;
+ box.mSyncInterval = Account.CHECK_INTERVAL_NEVER;
box.mType = type;
box.mServerId = "serverid-" + name;
box.mParentServerId = parentBox != null ? parentBox.mServerId : "parent-serverid-" + name;
diff --git a/tests/src/com/android/exchange/provider/ExchangeDirectoryProviderTests.java b/tests/src/com/android/exchange/provider/ExchangeDirectoryProviderTests.java
index b163637..e4bd791 100644
--- a/tests/src/com/android/exchange/provider/ExchangeDirectoryProviderTests.java
+++ b/tests/src/com/android/exchange/provider/ExchangeDirectoryProviderTests.java
@@ -17,7 +17,7 @@
package com.android.exchange.provider;
import com.android.emailcommon.mail.PackedString;
-import com.android.emailcommon.provider.EmailContent.Account;
+import com.android.emailcommon.provider.Account;
import com.android.exchange.provider.GalResult.GalData;
import com.android.exchange.utility.ExchangeTestCase;
diff --git a/tests/src/com/android/exchange/provider/MailboxUtilitiesTests.java b/tests/src/com/android/exchange/provider/MailboxUtilitiesTests.java
index 908397d..57b5fb9 100644
--- a/tests/src/com/android/exchange/provider/MailboxUtilitiesTests.java
+++ b/tests/src/com/android/exchange/provider/MailboxUtilitiesTests.java
@@ -16,7 +16,7 @@
package com.android.exchange.provider;
-import com.android.emailcommon.provider.EmailContent.Account;
+import com.android.emailcommon.provider.Account;
import com.android.emailcommon.provider.EmailContent.MailboxColumns;
import com.android.emailcommon.provider.Mailbox;
import com.android.exchange.utility.ExchangeTestCase;
diff --git a/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java b/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java
index 80689cb..3fdc738 100644
--- a/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java
+++ b/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java
@@ -17,7 +17,7 @@
package com.android.exchange.utility;
import com.android.emailcommon.mail.Address;
-import com.android.emailcommon.provider.EmailContent.Account;
+import com.android.emailcommon.provider.Account;
import com.android.emailcommon.provider.EmailContent.Attachment;
import com.android.emailcommon.provider.EmailContent.Message;
import com.android.emailcommon.utility.Utility;
diff --git a/tests/src/com/android/exchange/utility/ExchangeTestCase.java b/tests/src/com/android/exchange/utility/ExchangeTestCase.java
index 732ca60..86ea0c5 100644
--- a/tests/src/com/android/exchange/utility/ExchangeTestCase.java
+++ b/tests/src/com/android/exchange/utility/ExchangeTestCase.java
@@ -16,7 +16,7 @@
package com.android.exchange.utility;
-import com.android.emailcommon.provider.EmailContent.Account;
+import com.android.emailcommon.provider.Account;
import com.android.exchange.provider.EmailContentSetupUtils;
import android.content.ContentResolver;
