diff options
Diffstat (limited to 'src/com/android/exchange/eas')
| -rw-r--r-- | src/com/android/exchange/eas/EasFolderSync.java | 19 | ||||
| -rw-r--r-- | src/com/android/exchange/eas/EasOperation.java | 33 | ||||
| -rw-r--r-- | src/com/android/exchange/eas/EasSync.java | 5 |
3 files changed, 32 insertions, 25 deletions
diff --git a/src/com/android/exchange/eas/EasFolderSync.java b/src/com/android/exchange/eas/EasFolderSync.java index 696a4e72..1be9fe74 100644 --- a/src/com/android/exchange/eas/EasFolderSync.java +++ b/src/com/android/exchange/eas/EasFolderSync.java @@ -155,24 +155,11 @@ public class EasFolderSync extends EasOperation { @Override protected int handleResponse(final EasResponse response, final SyncResult syncResult) - throws IOException { + throws IOException, CommandStatusException { if (!response.isEmpty()) { - try { - new FolderSyncParser(mContext, mContext.getContentResolver(), - response.getInputStream(), mAccount, mStatusOnly).parse(); - } catch (final CommandStatusException e) { - final int status = e.mStatus; - LogUtils.e(LOG_TAG, "EasFolderSync.handleResponse status %d", status); - if (CommandStatusException.CommandStatus.isNeedsProvisioning(status)) { - return RESULT_PROVISIONING_ERROR; - } - if (CommandStatusException.CommandStatus.isDeniedAccess(status)) { - return RESULT_FORBIDDEN; - } - return RESULT_OTHER_FAILURE; - } + new FolderSyncParser(mContext, mContext.getContentResolver(), + response.getInputStream(), mAccount, mStatusOnly).parse(); } - return RESULT_OK; } diff --git a/src/com/android/exchange/eas/EasOperation.java b/src/com/android/exchange/eas/EasOperation.java index 37b7ead8..bf7b0134 100644 --- a/src/com/android/exchange/eas/EasOperation.java +++ b/src/com/android/exchange/eas/EasOperation.java @@ -33,6 +33,7 @@ import com.android.emailcommon.provider.EmailContent; import com.android.emailcommon.provider.HostAuth; import com.android.emailcommon.provider.Mailbox; import com.android.emailcommon.utility.Utility; +import com.android.exchange.CommandStatusException; import com.android.exchange.Eas; import com.android.exchange.EasResponse; import com.android.exchange.adapter.Serializer; @@ -220,22 +221,42 @@ public abstract class EasOperation { final int result; // First off, the success case. if (response.isSuccess()) { + int responseResult; try { - result = handleResponse(response, syncResult); - if (result >= 0) { - return result; - } + responseResult = handleResponse(response, syncResult); } catch (final IOException e) { LogUtils.e(LOG_TAG, e, "Exception while handling response"); if (syncResult != null) { ++syncResult.stats.numIoExceptions; } return RESULT_REQUEST_FAILURE; + } catch (final CommandStatusException e) { + // For some operations (notably Sync & FolderSync), errors are signaled in + // the payload of the response. These will have a HTTP 200 response, and the + // error condition is only detected during response parsing. + // The various parsers handle this by throwing a CommandStatusException. + // TODO: Consider having the parsers return the errors instead of throwing. + final int status = e.mStatus; + LogUtils.e(LOG_TAG, "CommandStatusException: %s, %d", getCommand(), status); + if (CommandStatusException.CommandStatus.isNeedsProvisioning(status)) { + responseResult = RESULT_PROVISIONING_ERROR; + } else if (CommandStatusException.CommandStatus.isDeniedAccess(status)) { + responseResult = RESULT_FORBIDDEN; + } else { + responseResult = RESULT_OTHER_FAILURE; + } } + result = responseResult; } else { result = RESULT_OTHER_FAILURE; } + // Non-negative results indicate success. Return immediately and bypass the error + // handling. + if (result >= 0) { + return result; + } + // If this operation has distinct handling for 403 errors, do that. if (result == RESULT_FORBIDDEN || (response.isForbidden() && handleForbidden())) { LogUtils.e(LOG_TAG, "Forbidden response"); @@ -251,6 +272,8 @@ public abstract class EasOperation { if (handleProvisionError(syncResult, mAccountId)) { // The provisioning error has been taken care of, so we should re-do this // request. + LogUtils.d(LOG_TAG, "Provisioning error handled during %s, retrying", + getCommand()); continue; } if (syncResult != null) { @@ -376,7 +399,7 @@ public abstract class EasOperation { * @throws IOException */ protected abstract int handleResponse(final EasResponse response, final SyncResult syncResult) - throws IOException; + throws IOException, CommandStatusException; /** * The following functions may be overriden by a subclass, but most operations will not need diff --git a/src/com/android/exchange/eas/EasSync.java b/src/com/android/exchange/eas/EasSync.java index 710f692f..63950923 100644 --- a/src/com/android/exchange/eas/EasSync.java +++ b/src/com/android/exchange/eas/EasSync.java @@ -183,7 +183,7 @@ public class EasSync extends EasOperation { @Override protected int handleResponse(final EasResponse response, final SyncResult syncResult) - throws IOException { + throws IOException, CommandStatusException { final Account account = Account.restoreAccountWithId(mContext, mAccountId); if (account == null) { // TODO: Make this some other error type, since the account is just gone now. @@ -200,9 +200,6 @@ public class EasSync extends EasOperation { mMessageUpdateStatus = parser.getMessageStatuses(); } catch (final Parser.EmptyStreamException e) { // This indicates a compressed response which was empty, which is OK. - } catch (final CommandStatusException e) { - // TODO: This is the wrong error type. - return RESULT_OTHER_FAILURE; } return 0; } |