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

Commit 9380bea9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Support to launch the root from the intent without rootId"

parents e67f7d2a 9b9a282e

src/com/android/documentsui/AbstractActionHandler.java

+7 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ import com.android.documentsui.dirlist.FocusHandler; 
import com.android.documentsui.files.LauncherActivity;

import com.android.documentsui.queries.SearchViewManager;

import com.android.documentsui.roots.GetRootDocumentTask;

import com.android.documentsui.roots.LoadFirstRootTask;

import com.android.documentsui.roots.LoadRootTask;

import com.android.documentsui.roots.ProvidersAccess;

import com.android.documentsui.sidebar.EjectRootTask;
@@ -474,6 +475,12 @@ public abstract class AbstractActionHandler<T extends Activity & CommonAddons> 
                .executeOnExecutor(mExecutors.lookup(uri.getAuthority()));

    }



    @Override

    public final void loadFirstRoot(Uri uri) {

        new LoadFirstRootTask<>(mActivity, mProviders, mState, uri)

                .executeOnExecutor(mExecutors.lookup(uri.getAuthority()));

    }



    @Override

    public void loadDocumentsForCurrentStack() {

        DocumentStack stack = mState.stack;

src/com/android/documentsui/ActionHandler.java

+2 −0
Original line number Diff line number Diff line
@@ -95,6 +95,8 @@ public interface ActionHandler { 


    void loadRoot(Uri uri);



    void loadFirstRoot(Uri uri);



    void openSelectedInNewWindow();



    void openInNewWindow(DocumentStack path);

src/com/android/documentsui/files/ActionHandler.java

+6 −0
Original line number Diff line number Diff line
@@ -518,6 +518,12 @@ public class ActionHandler<T extends Activity & Addons> extends AbstractActionHa 
                // authority. That way a misbehaving provider won't result in an ANR.

                loadRoot(uri);

                return true;

            } else if (DocumentsContract.isRootsUri(mActivity, uri)) {

                if (DEBUG) Log.d(TAG, "Launching first root with roots URI.");

                // TODO: b/116760996 Let the user can disambiguate between roots if there are

                // multiple from DocumentsProvider instead of launching the first root in default

                loadFirstRoot(uri);

                return true;

            }

        }

        return false;

src/com/android/documentsui/roots/LoadFirstRootTask.java

0 → 100644
+47 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.documentsui.roots;



import android.app.Activity;

import android.net.Uri;



import com.android.documentsui.AbstractActionHandler.CommonAddons;

import com.android.documentsui.base.RootInfo;

import com.android.documentsui.base.State;



import java.util.Collection;



public final class LoadFirstRootTask<T extends Activity & CommonAddons>

        extends LoadRootTask<T> {



    public LoadFirstRootTask(T activity, ProvidersAccess providers, State state, Uri rootUri) {

        super(activity, providers, state, rootUri);

    }



    @Override

    protected String getRootId(Uri rootUri) {

        final String authority = rootUri.getAuthority();

        String rootId = null;



        final Collection<RootInfo> roots = mProviders.getRootsForAuthorityBlocking(authority);

        if (!roots.isEmpty()) {

            rootId = roots.iterator().next().rootId;

        }



        return rootId;

    }

}

src/com/android/documentsui/roots/LoadRootTask.java

+8 −5
Original line number Diff line number Diff line
@@ -28,15 +28,15 @@ import com.android.documentsui.base.PairedTask; 
import com.android.documentsui.base.RootInfo;

import com.android.documentsui.base.State;



public final class LoadRootTask<T extends Activity & CommonAddons>

public class LoadRootTask<T extends Activity & CommonAddons>

        extends PairedTask<T, Void, RootInfo> {

    private static final String TAG = "LoadRootTask";



    protected final ProvidersAccess mProviders;



    private final State mState;

    private final ProvidersAccess mProviders;

    private final Uri mRootUri;





    public LoadRootTask(T activity, ProvidersAccess providers, State state, Uri rootUri) {

        super(activity);

        mState = state;
@@ -48,8 +48,7 @@ public final class LoadRootTask<T extends Activity & CommonAddons> 
    protected RootInfo run(Void... params) {

        if (DEBUG) Log.d(TAG, "Loading root: " + mRootUri);



        String rootId = DocumentsContract.getRootId(mRootUri);

        return mProviders.getRootOneshot(mRootUri.getAuthority(), rootId);

        return mProviders.getRootOneshot(mRootUri.getAuthority(), getRootId(mRootUri));

    }



    @Override
@@ -62,4 +61,8 @@ public final class LoadRootTask<T extends Activity & CommonAddons> 
            mOwner.finish();

        }

    }



    protected String getRootId(Uri rootUri) {

        return DocumentsContract.getRootId(rootUri);

    }

}