PeterCxy
/
Shelter
3
2
Fork 0
Code Issues Projects Releases Activity

DocumentsProvider: correctly handle non-default projections

This commit is contained in:
Peter Cai 2018-09-21 16:31:05 +08:00
parent c716a22df8
commit d5a6ec1008
No known key found for this signature in database
GPG Key ID: 71F5FB4E4F3FD54F
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/net/typeblog/shelter/util/CrossProfileDocumentsProvider.java
View File

@ -118,7 +118,7 @@ public class CrossProfileDocumentsProvider extends DocumentsProvider {
@Override
public Cursor queryRoots(String[] projection) {
final MatrixCursor result = new MatrixCursor(DEFAULT_ROOT_PROJECTION);
final MatrixCursor result = new MatrixCursor(projection == null ? DEFAULT_ROOT_PROJECTION : projection);
final MatrixCursor.RowBuilder row = result.newRow();
row.add(DocumentsContract.Root.COLUMN_ROOT_ID, DUMMY_ROOT);
row.add(DocumentsContract.Root.COLUMN_DOCUMENT_ID, DUMMY_ROOT);
@ -136,7 +136,7 @@ public class CrossProfileDocumentsProvider extends DocumentsProvider {
@Override
public Cursor queryDocument(String documentId, String[] projection) {
ensureServiceBound();
final MatrixCursor result = new MatrixCursor(DEFAULT_DOCUMENT_PROJECTION);
final MatrixCursor result = new MatrixCursor(projection == null ? DEFAULT_DOCUMENT_PROJECTION : projection);
Map<String, Object> fileInfo = null;
try {
fileInfo = mService.loadFileMeta(documentId);
@ -156,7 +156,7 @@ public class CrossProfileDocumentsProvider extends DocumentsProvider {
} catch (RemoteException e) {
return null;
}
final MatrixCursor result = new MatrixCursor(DEFAULT_DOCUMENT_PROJECTION);
final MatrixCursor result = new MatrixCursor(projection == null ? DEFAULT_DOCUMENT_PROJECTION : projection);
// Allow receiving notification on create / delete
result.setNotificationUri(getContext().getContentResolver(),
DocumentsContract.buildDocumentUri(AUTHORITY, parentDocumentId));