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

Commit 94785ef3 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

More movement towards public APIs. 

Starts using new FileUtils and ContentProviderClient public APIs as
part of getting DocumentsUI building against public API.

Some mechanical refactoring using "sed".

Test: builds
Bug: 110959821
Change-Id: I79918ac938f71903685c5a778763d5e3cc20098c
parent 00a12bf0

src/com/android/documentsui/CreateDirectoryFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ public class CreateDirectoryFragment extends DialogFragment { 
                Log.w(TAG, "Failed to create directory", e);

                return null;

            } finally {

                ContentProviderClient.releaseQuietly(client);

                ContentProviderClient.closeQuietly(client);

            }

        }

src/com/android/documentsui/DirectoryLoader.java

+6 −6
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ import com.android.documentsui.roots.RootCursorWrapper; 
import com.android.documentsui.selection.ContentLock;

import com.android.documentsui.sorting.SortModel;



import libcore.io.IoUtils;

import android.os.FileUtils;



public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> {
@@ -158,7 +158,7 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> { 
                mSignal = null;

            }

            // TODO: Remove this call.

            ContentProviderClient.releaseQuietly(client);

            ContentProviderClient.closeQuietly(client);

        }



        return result;
@@ -178,7 +178,7 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> { 
    @Override

    public void deliverResult(DirectoryResult result) {

        if (isReset()) {

            IoUtils.closeQuietly(result);

            FileUtils.closeQuietly(result);

            return;

        }

        DirectoryResult oldResult = mResult;
@@ -189,7 +189,7 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> { 
        }



        if (oldResult != null && oldResult != result) {

            IoUtils.closeQuietly(oldResult);

            FileUtils.closeQuietly(oldResult);

        }

    }
@@ -210,7 +210,7 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> { 


    @Override

    public void onCanceled(DirectoryResult result) {

        IoUtils.closeQuietly(result);

        FileUtils.closeQuietly(result);

    }



    @Override
@@ -220,7 +220,7 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> { 
        // Ensure the loader is stopped

        onStopLoading();



        IoUtils.closeQuietly(mResult);

        FileUtils.closeQuietly(mResult);

        mResult = null;



        getContext().getContentResolver().unregisterContentObserver(mObserver);

src/com/android/documentsui/DirectoryResult.java

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import android.database.Cursor; 
import com.android.documentsui.archives.ArchivesProvider;

import com.android.documentsui.base.DocumentInfo;



import libcore.io.IoUtils;

import android.os.FileUtils;



public class DirectoryResult implements AutoCloseable {
@@ -34,7 +34,7 @@ public class DirectoryResult implements AutoCloseable { 


    @Override

    public void close() {

        IoUtils.closeQuietly(cursor);

        FileUtils.closeQuietly(cursor);

        if (client != null && doc.isInArchive()) {

            ArchivesProvider.releaseArchive(client, doc.derivedUri);

        }

src/com/android/documentsui/RecentsLoader.java

+8 −8
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ import androidx.annotation.GuardedBy; 


import com.google.common.util.concurrent.AbstractFuture;



import libcore.io.IoUtils;

import android.os.FileUtils;



import java.io.Closeable;

import java.io.IOException;
@@ -247,7 +247,7 @@ public class RecentsLoader extends AsyncTaskLoader<DirectoryResult> { 
    @Override

    public void deliverResult(DirectoryResult result) {

        if (isReset()) {

            IoUtils.closeQuietly(result);

            FileUtils.closeQuietly(result);

            return;

        }

        DirectoryResult oldResult = mResult;
@@ -258,7 +258,7 @@ public class RecentsLoader extends AsyncTaskLoader<DirectoryResult> { 
        }



        if (oldResult != null && oldResult != result) {

            IoUtils.closeQuietly(oldResult);

            FileUtils.closeQuietly(oldResult);

        }

    }
@@ -279,7 +279,7 @@ public class RecentsLoader extends AsyncTaskLoader<DirectoryResult> { 


    @Override

    public void onCanceled(DirectoryResult result) {

        IoUtils.closeQuietly(result);

        FileUtils.closeQuietly(result);

    }



    @Override
@@ -291,11 +291,11 @@ public class RecentsLoader extends AsyncTaskLoader<DirectoryResult> { 


        synchronized (mTasks) {

            for (RecentsTask task : mTasks.values()) {

                IoUtils.closeQuietly(task);

                FileUtils.closeQuietly(task);

            }

        }



        IoUtils.closeQuietly(mResult);

        FileUtils.closeQuietly(mResult);

        mResult = null;

    }
@@ -365,7 +365,7 @@ public class RecentsLoader extends AsyncTaskLoader<DirectoryResult> { 
            } catch (Exception e) {

                Log.w(TAG, "Failed to acquire content resolver for authority: " + authority);

            } finally {

                ContentProviderClient.releaseQuietly(client);

                ContentProviderClient.closeQuietly(client);

            }



            set(mCursors);
@@ -383,7 +383,7 @@ public class RecentsLoader extends AsyncTaskLoader<DirectoryResult> { 
            }



            for (Cursor cursor : mCursors) {

                IoUtils.closeQuietly(cursor);

                FileUtils.closeQuietly(cursor);

            }



            mIsClosed = true;

src/com/android/documentsui/RefreshTask.java

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ public class RefreshTask extends TimeoutTask<Void, Boolean> { 
        } catch (Exception e) {

            Log.w(TAG, "Failed to refresh", e);

        } finally {

            ContentProviderClient.releaseQuietly(client);

            ContentProviderClient.closeQuietly(client);

        }

        return refreshSupported;

    }