diff options
author | Martin Hibdon <mhibdon@google.com> | 2014-11-02 19:27:54 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-02 19:27:54 +0000 |
commit | a993369c659247e0ee23282809fda41b24c75574 (patch) | |
tree | 487472184bfdbd72def7f2227b288fd842b2d609 | |
parent | 6898763f722fd88f02d8e1abb41c6f6d8da08bbe (diff) | |
parent | 0ceec56ab66d60124e4aec57c38856c67ba2ab16 (diff) | |
download | android_packages_apps_Exchange-a993369c659247e0ee23282809fda41b24c75574.tar.gz android_packages_apps_Exchange-a993369c659247e0ee23282809fda41b24c75574.tar.bz2 android_packages_apps_Exchange-a993369c659247e0ee23282809fda41b24c75574.zip |
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 '0ceec56ab66d60124e4aec57c38856c67ba2ab16':
If an account does not support smart forward, then it doesn't do smart reply either
-rw-r--r-- | src/com/android/exchange/eas/EasFullSyncOperation.java | 2 | ||||
-rw-r--r-- | src/com/android/exchange/eas/EasOutboxSync.java | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/exchange/eas/EasFullSyncOperation.java b/src/com/android/exchange/eas/EasFullSyncOperation.java index 9472e4f3..ba81466e 100644 --- a/src/com/android/exchange/eas/EasFullSyncOperation.java +++ b/src/com/android/exchange/eas/EasFullSyncOperation.java @@ -307,6 +307,8 @@ public class EasFullSyncOperation extends EasOperation { 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 049fd19d..6f85f771 100644 --- a/src/com/android/exchange/eas/EasOutboxSync.java +++ b/src/com/android/exchange/eas/EasOutboxSync.java @@ -348,8 +348,10 @@ public class EasOutboxSync extends EasOperation { 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; } |