diff options
| author | Martin Hibdon <mhibdon@google.com> | 2014-10-21 20:08:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-21 20:08:50 +0000 |
| commit | 764d7b2f660cf22ded3ec290ae716bf806abe489 (patch) | |
| tree | f4f8af2e27bce7a52158ce6caf363470c16e4f79 /provider_src | |
| parent | 98f764fb726b07dbbb20fdd31f5b0377be627269 (diff) | |
| parent | 99665fe7bfabd0e84e3c1e05bbec5f11fb9a904c (diff) | |
| download | android_packages_apps_Email-764d7b2f660cf22ded3ec290ae716bf806abe489.tar.gz android_packages_apps_Email-764d7b2f660cf22ded3ec290ae716bf806abe489.tar.bz2 android_packages_apps_Email-764d7b2f660cf22ded3ec290ae716bf806abe489.zip | |
Merge "Disable smart foward/reply" into ub-gmail-ur14-dev
Diffstat (limited to 'provider_src')
| -rw-r--r-- | provider_src/com/android/email/provider/EmailProvider.java | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/provider_src/com/android/email/provider/EmailProvider.java b/provider_src/com/android/email/provider/EmailProvider.java index bc7f374ad..4bd9d4d19 100644 --- a/provider_src/com/android/email/provider/EmailProvider.java +++ b/provider_src/com/android/email/provider/EmailProvider.java @@ -1422,7 +1422,6 @@ public class EmailProvider extends ContentProvider case UPDATED_MESSAGE_ID: case ATTACHMENT_ID: case MAILBOX_ID: - case ACCOUNT_ID: case HOSTAUTH_ID: case CREDENTIAL_ID: case POLICY_ID: @@ -1430,6 +1429,25 @@ public class EmailProvider extends ContentProvider c = db.query(tableName, projection, whereWithId(id, selection), selectionArgs, null, null, sortOrder, limit); break; + case ACCOUNT_ID: + id = uri.getPathSegments().get(1); + // There seems to be an issue with smart forwarding sometimes including the + // quoted text from the wrong message. For now, we just disable it. + final String[] alternateProjection = new String[projection.length]; + for (int i = 0; i < projection.length; i++) { + String column = projection[i]; + if (TextUtils.equals(column, AccountColumns.FLAGS)) { + alternateProjection[i] = AccountColumns.FLAGS + " & ~" + + Account.FLAGS_SUPPORTS_SMART_FORWARD + " AS " + + AccountColumns.FLAGS; + } else { + alternateProjection[i] = projection[i]; + } + } + + c = db.query(tableName, alternateProjection, whereWithId(id, selection), + selectionArgs, null, null, sortOrder, limit); + break; case QUICK_RESPONSE_ID: id = uri.getPathSegments().get(1); c = uiQuickResponseId(projection, id); |