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

Commit dc80188e authored by Stephen Bird's avatar Stephen Bird Committed by Richard MacGregor
Browse files

Refresh: stop refreshes in action 

If a refresh happens while another refresh is occuring, make sure
that that old refresh is cancelled. In addition to this, remove some
old logic that conflicted with itself. Also, keep ahold of the previous directory
before running the task.

Ticket: QRDL-1002
Change-Id: Ibc1f3d468243bc124d3baf259af21464f3c03c84
parent aeefe0da

src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java

+29 −30
Original line number Diff line number Diff line
@@ -271,11 +271,6 @@ BreadcrumbListener, OnSelectionChangedListener, OnSelectionListener, OnRequestRe 
            }



            //Check that it is really necessary change the directory

            if (!mReload && NavigationView.this.mCurrentDir != null &&

                    NavigationView.this.mCurrentDir.compareTo(mNewDirChecked) == 0) {

                return null;

            }



            mHasChanged = !(NavigationView.this.mCurrentDir != null &&

                    NavigationView.this.mCurrentDir.compareTo(mNewDirChecked) == 0);

            mIsNewHistory = (NavigationView.this.mCurrentDir != null);
@@ -422,28 +417,11 @@ BreadcrumbListener, OnSelectionChangedListener, OnSelectionListener, OnRequestRe 
        @Override

        protected void onPostExecute(List<FileSystemObject> files) {

            // This means an exception. This method will be recalled then

            if (files != null) {

            onPostExecuteTask(files, mAddToHistory, mIsNewHistory, mHasChanged,

                        mSearchInfo, mNewDirChecked, mNewDirFSO, mScrollTo);



            // Do animation

            fadeEfect(false);

            } else {

                if (TextUtils.isEmpty(mCurrentDir)) {

                    if (mOnBackRequestListener != null) {

                        // Go back to previous view

                        post(new Runnable() {

                            @Override

                            public void run() {

                                mOnBackRequestListener.onBackRequested();

                            }

                        });

                    }

                } else {

                    // Reload current directory

                    changeCurrentDir(mCurrentDir);

                }

            }

        }



        /**
@@ -471,6 +449,7 @@ BreadcrumbListener, OnSelectionChangedListener, OnSelectionListener, OnRequestRe 
    private int mId;

    private String mCurrentDir;

    private FileSystemObject mCurrentFileSystemObject;

    private String mPreviousDir;

    private NavigationLayoutMode mCurrentMode;

    /**

     * @hide
@@ -566,7 +545,7 @@ BreadcrumbListener, OnSelectionChangedListener, OnSelectionListener, OnRequestRe 
        //Return the persistent the data

        NavigationViewInfoParcelable parcel = new NavigationViewInfoParcelable();

        parcel.setId(this.mId);

        parcel.setCurrentDir(this.mCurrentDir);

        parcel.setCurrentDir(this.mPreviousDir);

        parcel.setCurrentFso(this.mCurrentFileSystemObject);

        parcel.setChRooted(this.mChRooted);

        parcel.setSelectedFiles(this.mAdapter.getSelectedItems());
@@ -878,10 +857,15 @@ BreadcrumbListener, OnSelectionChangedListener, OnSelectionListener, OnRequestRe 
     */

    public void refresh(FileSystemObject scrollTo) {

        //Check that current directory was set

        if (this.mCurrentDir == null || this.mFiles == null || this.mNavigationTask != null) {

        if (this.mCurrentDir == null || this.mFiles == null) {

            return;

        }



        if (this.mNavigationTask != null) {

            this.mNavigationTask.cancel(true);

            this.mNavigationTask = null;

        }



        //Reload data

        changeCurrentDir(this.mCurrentDir, false, true, false, null, scrollTo);

    }
@@ -1098,9 +1082,11 @@ BreadcrumbListener, OnSelectionChangedListener, OnSelectionListener, OnRequestRe 
            final String newDir, final boolean addToHistory,

            final boolean reload, final boolean useCurrent,

            final SearchInfoParcelable searchInfo, final FileSystemObject scrollTo) {

        this.mPreviousDir = this.mCurrentDir;

        this.mCurrentDir = newDir;

        mNavigationTask = new NavigationTask(useCurrent, addToHistory, reload,

                searchInfo, scrollTo, mRestrictions, mChRooted);

        mNavigationTask.executeOnExecutor(AsyncTask.SERIAL_EXECUTOR, newDir);

        mNavigationTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, newDir);

    }



    /**
@@ -1145,6 +1131,18 @@ BreadcrumbListener, OnSelectionChangedListener, OnSelectionListener, OnRequestRe 
        try {

            //Check that there is not errors and have some data

            if (files == null) {

                this.mCurrentDir = this.mPreviousDir;

                if (TextUtils.isEmpty(mCurrentDir)) {

                    if (mOnBackRequestListener != null) {

                        // Go back to previous view

                        post(new Runnable() {

                            @Override

                            public void run() {

                                mOnBackRequestListener.onBackRequested();

                            }

                        });

                    }

                }

                return;

            }
@@ -1188,7 +1186,6 @@ BreadcrumbListener, OnSelectionChangedListener, OnSelectionListener, OnRequestRe 
            scrollTo(scrollTo);



            //The current directory is now the "newDir"

            this.mCurrentDir = newDir;

            this.mCurrentFileSystemObject = newDirFSO;

            if (this.mOnDirectoryChangedListener != null) {

                FileSystemObject dir = (newDirFSO != null) ?
@@ -1196,13 +1193,15 @@ BreadcrumbListener, OnSelectionChangedListener, OnSelectionListener, OnRequestRe 
                this.mOnDirectoryChangedListener.onDirectoryChanged(dir);

            }



            mNavigationTask = null;

        } finally {

            //If calling activity is search, then save the search history

            if (searchInfo != null) {

                this.mOnHistoryListener.onNewHistory(searchInfo);

            }



            this.mPreviousDir = null;

            mNavigationTask = null;



            //End of loading data

            try {

                NavigationView.this.mBreadcrumb.endLoading();