Get rid of deleteAccountPIMData from IEmailService

This doesn't need to be part of the service because the
implementation doesn't need to be different between any
of the different protocols.

Change-Id: Ifddf16dd3ccaf397029f08f6d4283d9a5630f717
This commit is contained in:
Martin Hibdon 2014-05-21 12:16:24 -07:00
parent 2fbd8c269c
commit cf2178c4fa
5 changed files with 3 additions and 44 deletions

View File

@ -247,28 +247,6 @@ public class EmailServiceProxy extends ServiceProxy implements IEmailService {
}, "sendMeetingResponse");
}
/**
* Request the service to delete the account's PIM (personal information management) data. This
* data includes any data that is 1) associated with the account and 2) created/stored by the
* service or its sync adapters and 3) not stored in the EmailProvider database (e.g. contact
* and calendar information).
*
* @param emailAddress the email address for the account whose data should be deleted
*/
@Override
public void deleteAccountPIMData(final String emailAddress) throws RemoteException {
setTask(new ProxyTask() {
@Override
public void run() throws RemoteException {
mService.deleteAccountPIMData(emailAddress);
}
}, "deleteAccountPIMData");
// This can be called when deleting accounts. After making this call, the caller will
// ask for account reconciliation, which will kill the processes. We wait for completion
// to avoid the race.
waitForCompletion();
}
/**
* Search for messages given a query string. The string is interpreted as the logical AND of
* terms separated by white space. The search is performed on the specified mailbox in the

View File

@ -53,7 +53,4 @@ interface IEmailService {
// Service control operations (i.e. does not generate a client-server message).
oneway void setLogging(int on);
// Needs to get moved into Email since this is NOT a client-server command.
void deleteAccountPIMData(String emailAddress);
}

View File

@ -5947,17 +5947,10 @@ public class EmailProvider extends ContentProvider {
cv.putNull(AccountColumns.SYNC_KEY);
resolver.update(Account.CONTENT_URI, cv, Account.ID_SELECTION, accountIdArgs);
// Delete PIM data (contacts, calendar), stop syncs, etc. if applicable
// Delete the account from the Android account manager.
// This will delete any contacts and calendar data, stop syncs, etc.
if (emailAddress != null) {
final IEmailService service =
EmailServiceUtils.getServiceForAccount(context, accountId);
if (service != null) {
try {
service.deleteAccountPIMData(emailAddress);
} catch (final RemoteException e) {
// Can't do anything about this
}
}
AccountReconciler.reconcileAccounts(context);
}
}

View File

@ -380,11 +380,6 @@ public abstract class EmailServiceStub extends IEmailService.Stub implements IEm
// Not required
}
@Override
public void deleteAccountPIMData(final String emailAddress) throws RemoteException {
AccountReconciler.reconcileAccounts(mContext);
}
@Override
public int searchMessages(long accountId, SearchParams params, long destMailboxId)
throws RemoteException {

View File

@ -679,10 +679,6 @@ public class EmailServiceUtils {
public void sendMeetingResponse(long messageId, int response) throws RemoteException {
}
@Override
public void deleteAccountPIMData(final String emailAddress) throws RemoteException {
}
@Override
public int searchMessages(long accountId, SearchParams params, long destMailboxId)
throws RemoteException {