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

Commit 5fa73d1d authored by Zemiao Zhu's avatar Zemiao Zhu
Browse files

Hide files with hidden folder on the path(documentID). 

Bug: 138309749
Test: atest DocumentsUIGoogleTests
Change-Id: I5ef3f8a44c4b6acbe07a3ba2aaf08fa50e355094
parent bd37bef9

src/com/android/documentsui/base/FilteringCursorWrapper.java

+3 −2
Original line number Diff line number Diff line
@@ -80,8 +80,9 @@ public class FilteringCursorWrapper extends AbstractCursor { 


        cursor.moveToPosition(-1);

        while (cursor.moveToNext() && mCount < count) {

            final String name = getCursorString(cursor, Document.COLUMN_DISPLAY_NAME);

            if (!showHiddenFiles && name != null && name.startsWith(".")) {

            final String documentId = getCursorString(cursor, Document.COLUMN_DOCUMENT_ID);

            if (!showHiddenFiles && documentId != null

                    && (documentId.startsWith(".") || documentId.contains("/."))) {

                continue;

            }

            mPosition[mCount++] = cursor.getPosition();

tests/unit/com/android/documentsui/GlobalSearchLoaderTest.java

+6 −4
Original line number Diff line number Diff line
@@ -142,10 +142,12 @@ public class GlobalSearchLoaderTest { 


    @Test

    public void testShowOrHideHiddenFiles() {

        final DocumentInfo doc = mEnv.model.createFile(".test" + SEARCH_STRING);

        doc.lastModified = System.currentTimeMillis();

        final DocumentInfo doc1 = mEnv.model.createFile(".test" + SEARCH_STRING);

        final DocumentInfo doc2 = mEnv.model.createFile("test" + SEARCH_STRING);

        doc1.documentId = ".test";

        doc2.documentId = "parent_folder/.hidden_folder/test";

        mEnv.mockProviders.get(TestProvidersAccess.DOWNLOADS.authority)

                .setNextChildDocumentsReturns(doc);

                .setNextChildDocumentsReturns(doc1, doc2);



        assertEquals(false, mLoader.mState.showHiddenFiles);

        DirectoryResult result = mLoader.loadInBackground();
@@ -153,7 +155,7 @@ public class GlobalSearchLoaderTest { 


        mLoader.mState.showHiddenFiles = true;

        result = mLoader.loadInBackground();

        assertEquals(1, result.cursor.getCount());

        assertEquals(2, result.cursor.getCount());

    }



    @Test

tests/unit/com/android/documentsui/RecentsLoaderTests.java

+8 −4
Original line number Diff line number Diff line
@@ -105,10 +105,14 @@ public class RecentsLoaderTests { 


    @Test

    public void testShowOrHideHiddenFiles() {

        final DocumentInfo doc = mEnv.model.createFile(".test");

        doc.lastModified = System.currentTimeMillis();

        final DocumentInfo doc1 = mEnv.model.createFile(".test");

        final DocumentInfo doc2 = mEnv.model.createFile("test");

        doc1.documentId = ".test";

        doc2.documentId = "parent_folder/.hidden_folder/test";

        doc1.lastModified = System.currentTimeMillis();

        doc2.lastModified = System.currentTimeMillis();

        mEnv.mockProviders.get(TestProvidersAccess.HOME.authority)

                .setNextRecentDocumentsReturns(doc);

                .setNextRecentDocumentsReturns(doc1, doc2);



        assertEquals(false, mLoader.mState.showHiddenFiles);

        DirectoryResult result = mLoader.loadInBackground();
@@ -116,7 +120,7 @@ public class RecentsLoaderTests { 


        mLoader.mState.showHiddenFiles = true;

        result = mLoader.loadInBackground();

        assertEquals(1, result.cursor.getCount());

        assertEquals(2, result.cursor.getCount());

    }



    @Test