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

am 0d17c67b: am 9b040bde: Base64 the folder persistent id.

Browse Source 
* commit '0d17c67b75ff0f797aba651fc1810972245884ef':
  Base64 the folder persistent id.
This commit is contained in:
Yu Ping Hu 2013-04-15 11:03:31 -07:00 committed by Android Git Automerger
commit f593b77761
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,6 +45,7 @@ import android.os.RemoteException;
import android.provider.BaseColumns; import android.provider.BaseColumns;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.format.DateUtils; import android.text.format.DateUtils;
import android.util.Base64;
import android.util.Log; import android.util.Log;
import com.android.common.content.ProjectionMap; import com.android.common.content.ProjectionMap;
@ -2730,6 +2731,25 @@ outer:
} }
values.put(UIProvider.FolderColumns.CAPABILITIES, values.put(UIProvider.FolderColumns.CAPABILITIES,
getFolderCapabilities(info, mailbox.mFlags, mailbox.mType, mailboxId)); getFolderCapabilities(info, mailbox.mFlags, mailbox.mType, mailboxId));
// The persistent id is used to form a filename, so we must ensure that it doesn't
// include illegal characters (such as '/'). Only perform the encoding if this
// query wants the persistent id.
boolean shouldEncodePersistentId = false;
if (uiProjection == null) {
shouldEncodePersistentId = true;
} else {
for (final String column : uiProjection) {
if (TextUtils.equals(column, UIProvider.FolderColumns.PERSISTENT_ID)) {
shouldEncodePersistentId = true;
break;
}
}
}
if (shouldEncodePersistentId) {
values.put(UIProvider.FolderColumns.PERSISTENT_ID,
Base64.encodeToString(mailbox.mServerId.getBytes(),
Base64.URL_SAFE | Base64.NO_WRAP | Base64.NO_PADDING));
}
} }
} }
StringBuilder sb = genSelect(getFolderListMap(), uiProjection, values); StringBuilder sb = genSelect(getFolderListMap(), uiProjection, values);