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

Make sure we send callbacks for UI requested syncs

Browse Source 
* In the case in which a sync was requested during an already-running
  sync, we weren't passing the request information into the service

Bug: 3143544
Change-Id: I098161830844f604e4aa5b9c067491d2777d78c3
This commit is contained in:
Marc Blank 2010-11-29 10:21:14 -08:00
parent ac25a48d7b
commit 1b6623b092
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/exchange/EasSyncService.java
View File

@ -2357,8 +2357,7 @@ public class EasSyncService extends AbstractSyncService {
public void run() { public void run() {
if (!setupService()) return; if (!setupService()) return;
if (mSyncReason == ExchangeService.SYNC_SERVICE_START_SYNC || if (mSyncReason >= ExchangeService.SYNC_UI_REQUEST) {
mSyncReason == ExchangeService.SYNC_SERVICE_PART_REQUEST) {
try { try {
ExchangeService.callback().syncMailboxStatus(mMailboxId, ExchangeService.callback().syncMailboxStatus(mMailboxId,
EmailServiceStatus.IN_PROGRESS, 0); EmailServiceStatus.IN_PROGRESS, 0);
@ -2441,8 +2440,7 @@ public class EasSyncService extends AbstractSyncService {
} }
// Send a callback if this run was initiated by a service call // Send a callback if this run was initiated by a service call
if (mSyncReason == ExchangeService.SYNC_SERVICE_START_SYNC || if (mSyncReason >= ExchangeService.SYNC_UI_REQUEST) {
mSyncReason == ExchangeService.SYNC_SERVICE_PART_REQUEST) {
try { try {
ExchangeService.callback().syncMailboxStatus(mMailboxId, status, 0); ExchangeService.callback().syncMailboxStatus(mMailboxId, status, 0);
} catch (RemoteException e1) { } catch (RemoteException e1) {

28
src/com/android/exchange/ExchangeService.java
View File

@ -134,12 +134,15 @@ public class ExchangeService extends Service implements Runnable {
public static final int SYNC_PUSH = 2; public static final int SYNC_PUSH = 2;
// A ping (EAS push signal) was received // A ping (EAS push signal) was received
public static final int SYNC_PING = 3; public static final int SYNC_PING = 3;
// startSync was requested of ExchangeService
public static final int SYNC_SERVICE_START_SYNC = 4;
// A part request (attachment load, for now) was sent to ExchangeService
public static final int SYNC_SERVICE_PART_REQUEST = 5;
// Misc. // Misc.
public static final int SYNC_KICK = 6; public static final int SYNC_KICK = 4;
// Requests >= SYNC_UI_REQUEST generate callbacks to the UI
public static final int SYNC_UI_REQUEST = 5;
// startSync was requested of ExchangeService
public static final int SYNC_SERVICE_START_SYNC = SYNC_UI_REQUEST + 0;
// A part request (attachment load, for now) was sent to ExchangeService
public static final int SYNC_SERVICE_PART_REQUEST = SYNC_UI_REQUEST + 1;
private static final String WHERE_PUSH_OR_PING_NOT_ACCOUNT_MAILBOX = private static final String WHERE_PUSH_OR_PING_NOT_ACCOUNT_MAILBOX =
MailboxColumns.ACCOUNT_KEY + "=? and " + MailboxColumns.TYPE + "!=" + MailboxColumns.ACCOUNT_KEY + "=? and " + MailboxColumns.TYPE + "!=" +
@ -2273,7 +2276,7 @@ public class ExchangeService extends Service implements Runnable {
AbstractSyncService service = exchangeService.mServiceMap.get(mailboxId); AbstractSyncService service = exchangeService.mServiceMap.get(mailboxId);
if (service == null) { if (service == null) {
service = startManualSync(mailboxId, SYNC_SERVICE_PART_REQUEST, req); startManualSync(mailboxId, SYNC_SERVICE_PART_REQUEST, req);
kick("part request"); kick("part request");
} else { } else {
service.addRequest(req); service.addRequest(req);
@ -2306,20 +2309,25 @@ public class ExchangeService extends Service implements Runnable {
return PING_STATUS_OK; return PING_STATUS_OK;
} }
static public AbstractSyncService startManualSync(long mailboxId, int reason, Request req) { static public void startManualSync(long mailboxId, int reason, Request req) {
ExchangeService exchangeService = INSTANCE; ExchangeService exchangeService = INSTANCE;
if (exchangeService == null) return null; if (exchangeService == null) return;
synchronized (sSyncLock) { synchronized (sSyncLock) {
if (exchangeService.mServiceMap.get(mailboxId) == null) { AbstractSyncService svc = exchangeService.mServiceMap.get(mailboxId);
if (svc == null) {
exchangeService.mSyncErrorMap.remove(mailboxId); exchangeService.mSyncErrorMap.remove(mailboxId);
Mailbox m = Mailbox.restoreMailboxWithId(exchangeService, mailboxId); Mailbox m = Mailbox.restoreMailboxWithId(exchangeService, mailboxId);
if (m != null) { if (m != null) {
log("Starting sync for " + m.mDisplayName); log("Starting sync for " + m.mDisplayName);
exchangeService.requestSync(m, reason, req); exchangeService.requestSync(m, reason, req);
} }
} else {
// If this is a ui request, set the sync reason for the service
if (svc.mSyncReason >= SYNC_UI_REQUEST) {
svc.mSyncReason = reason;
}
} }
} }
return exchangeService.mServiceMap.get(mailboxId);
} }
// DO NOT CALL THIS IN A LOOP ON THE SERVICEMAP // DO NOT CALL THIS IN A LOOP ON THE SERVICEMAP