am 12a12e7c: am ae796083: am a993369c: am 0ceec56a: Merge "If an account does not support smart forward, then it doesn\'t do smart reply either" into ub-gmail-ur14-dev
* commit '12a12e7c57a921660ce690b740a5df8f13ac9e0b':
If an account does not support smart forward, then it doesn't do smart reply either
diff --git a/src/com/android/exchange/eas/EasFullSyncOperation.java b/src/com/android/exchange/eas/EasFullSyncOperation.java
index 9472e4f..ba81466 100644
--- a/src/com/android/exchange/eas/EasFullSyncOperation.java
+++ b/src/com/android/exchange/eas/EasFullSyncOperation.java
@@ -307,6 +307,8 @@
if (result == EasOutboxSync.RESULT_ITEM_NOT_FOUND) {
// This can happen if we are using smartReply, and the message we are referring
// to has disappeared from the server. Try again with smartReply disabled.
+ // This should be a legitimate, but unusual case. Log a warning.
+ LogUtils.w(TAG, "WARNING: EasOutboxSync falling back from smartReply");
op = new EasOutboxSync(mContext, mAccount, message, false);
result = op.performOperation();
}
diff --git a/src/com/android/exchange/eas/EasOutboxSync.java b/src/com/android/exchange/eas/EasOutboxSync.java
index 049fd19..6f85f77 100644
--- a/src/com/android/exchange/eas/EasOutboxSync.java
+++ b/src/com/android/exchange/eas/EasOutboxSync.java
@@ -348,8 +348,10 @@
if (reply && forward) {
return null;
}
- // If we don't support SmartForward and it's a forward, then don't proceed.
- if (forward && (account.mFlags & Account.FLAGS_SUPPORTS_SMART_FORWARD) == 0) {
+ // If we don't support SmartForward, then don't proceed.
+ // TODO: For now, we assume that if we do not support Smart Forward, we also don't
+ // support Smart Reply. At some point, perhaps these should be separate flags.
+ if ((account.mFlags & Account.FLAGS_SUPPORTS_SMART_FORWARD) == 0) {
return null;
}
