Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfb64adb authored by Kelvin Kwan's avatar Kelvin Kwan
Browse files

Use DocumentInfo.userId to get content resolver.

Test: atest DocumentsUIGoogleTests
Bug: 148264822
Change-Id: Iebb39751f236dc10169f2faddc809f029bc07aca
parent 2788bf12
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ public class CreateDirectoryFragment extends DialogFragment {

        @Override
        protected DocumentInfo doInBackground(Void... params) {
            final ContentResolver resolver = mActivity.getContentResolver();
            final ContentResolver resolver = mCwd.userId.getContentResolver(mActivity);
            ContentProviderClient client = null;
            try {
                client = DocumentsApplication.acquireUnstableProviderOrThrow(
+2 −2
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> {
            mSignal = new CancellationSignal();
        }

        final ContentResolver resolver = getContext().getContentResolver();
        final ContentResolver resolver = mDoc.userId.getContentResolver(getContext());
        final String authority = mUri.getAuthority();

        final DirectoryResult result = new DirectoryResult();
@@ -235,6 +235,6 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> {
        FileUtils.closeQuietly(mResult);
        mResult = null;

        getContext().getContentResolver().unregisterContentObserver(mObserver);
        mDoc.userId.getContentResolver(getContext()).unregisterContentObserver(mObserver);
    }
}
+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ public interface DocumentsAccess {

        @Override
        public Uri createDocument(DocumentInfo parentDoc, String mimeType, String displayName) {
            final ContentResolver resolver = mContext.getContentResolver();
            final ContentResolver resolver = parentDoc.userId.getContentResolver(mContext);
            try (ContentProviderClient client = DocumentsApplication.acquireUnstableProviderOrThrow(
                        resolver, parentDoc.derivedUri.getAuthority())) {
                return DocumentsContract.createDocument(
+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ public class ActionHandler<T extends FragmentActivity & AbstractActionHandler.Co

    @Override
    public @Nullable DocumentInfo renameDocument(String name, DocumentInfo document) {
        ContentResolver resolver = mActivity.getContentResolver();
        ContentResolver resolver = document.userId.getContentResolver(mActivity);
        ContentProviderClient client = null;

        try {
+2 −1
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ public final class InspectorController {
            if (docInfo.isMetadataSupported()) {
                mLoader.getDocumentMetadata(
                        docInfo.derivedUri,
                        docInfo.userId,
                        (Bundle bundle) -> {
                            onDocumentMetadataLoaded(docInfo, bundle);
                        });
@@ -304,7 +305,7 @@ public final class InspectorController {
         * @param uri
         * @param callback
         */
        void getDocumentMetadata(Uri uri, Consumer<Bundle> callback);
        void getDocumentMetadata(Uri uri, UserId userId, Consumer<Bundle> callback);
    }

    /**
Loading