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

am d77bf0c6: am 764d7b2f: Merge "Disable smart foward/reply" into ub-gmail-ur14-dev

Browse Source 
* commit 'd77bf0c6e1ea965f251c7408b77aed868ea80ca7':
  Disable smart foward/reply
This commit is contained in:
Martin Hibdon 2014-11-02 17:30:37 +00:00 committed by Android Git Automerger
commit c0e8417e68
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
provider_src/com/android/email/provider/EmailProvider.java
View File

@ -1422,7 +1422,6 @@ public class EmailProvider extends ContentProvider
case UPDATED_MESSAGE_ID: case UPDATED_MESSAGE_ID:
case ATTACHMENT_ID: case ATTACHMENT_ID:
case MAILBOX_ID: case MAILBOX_ID:
case ACCOUNT_ID:
case HOSTAUTH_ID: case HOSTAUTH_ID:
case CREDENTIAL_ID: case CREDENTIAL_ID:
case POLICY_ID: case POLICY_ID:
@ -1430,6 +1429,25 @@ public class EmailProvider extends ContentProvider
c = db.query(tableName, projection, whereWithId(id, selection), c = db.query(tableName, projection, whereWithId(id, selection),
selectionArgs, null, null, sortOrder, limit); selectionArgs, null, null, sortOrder, limit);
break; 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: case QUICK_RESPONSE_ID:
id = uri.getPathSegments().get(1); id = uri.getPathSegments().get(1);
c = uiQuickResponseId(projection, id); c = uiQuickResponseId(projection, id);