adapted during rebase

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

src/main/java/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java

@@ -1,736 +0,0 @@
-/**
- * ownCloud Android client application
- *
- * @author LukeOwncloud
- * @author masensio
- * Copyright (C) 2016 ownCloud Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.owncloud.android.ui.adapter;
-
-import android.accounts.Account;
-import android.content.Context;
-import android.database.DataSetObserver;
-import android.graphics.Bitmap;
-import android.support.design.widget.Snackbar;
-import android.text.format.DateUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseExpandableListAdapter;
-import android.widget.ExpandableListView;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import com.owncloud.android.R;
-import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.datamodel.ThumbnailsCacheManager;
-import com.owncloud.android.datamodel.UploadsStorageManager;
-import com.owncloud.android.datamodel.UploadsStorageManager.UploadStatus;
-import com.owncloud.android.db.OCUpload;
-import com.owncloud.android.db.UploadResult;
-import com.owncloud.android.files.services.FileUploader;
-import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.ui.activity.FileActivity;
-import com.owncloud.android.utils.DisplayUtils;
-import com.owncloud.android.utils.MimeTypeUtil;
-import com.owncloud.android.utils.ThemeUtils;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Observable;
-import java.util.Observer;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
-/**
- * This Adapter populates a ListView with following types of uploads: pending,
- * active, completed. Filtering possible.
- */
-public class ExpandableUploadListAdapter extends BaseExpandableListAdapter implements Observer {
-
-    private static final String TAG = ExpandableUploadListAdapter.class.getSimpleName();
-
-    public ProgressListener mProgressListener;
-
-    private FileActivity mParentActivity;
-
-    private UploadsStorageManager mUploadsStorageManager;
-
-    private UploadGroup[] mUploadGroups = null;
-
-    interface Refresh {
-        void refresh();
-    }
-
-    abstract class UploadGroup implements Refresh {
-        private OCUpload[] items;
-        private String name;
-
-        public UploadGroup(String groupName) {
-            this.name = groupName;
-            items = new OCUpload[0];
-        }
-
-        public String getGroupName() {
-            return name;
-        }
-
-        public OCUpload[] getItems() {
-            return items;
-        }
-
-        public void setItems(OCUpload[] items) {
-            this.items = items;
-        }
-
-        public int getGroupItemCount() {
-            return items == null ? 0 : items.length;
-        }
-
-        public Comparator<OCUpload> comparator = new Comparator<OCUpload>() {
-
-            @Override
-            public int compare(OCUpload upload1, OCUpload upload2) {
-                if (upload1 == null && upload2 == null) {
-                    return 0;
-                }
-                if (upload1 == null) {
-                    return -1;
-                }
-                if (upload2 == null) {
-                    return 1;
-                }
-                if (UploadStatus.UPLOAD_IN_PROGRESS.equals(upload1.getUploadStatus())) {
-                    if (!UploadStatus.UPLOAD_IN_PROGRESS.equals(upload2.getUploadStatus())) {
-                        return -1;
-                    }
-                    // both are in progress
-                    FileUploader.FileUploaderBinder binder = mParentActivity.getFileUploaderBinder();
-                    if (binder != null) {
-                        if (binder.isUploadingNow(upload1)) {
-                            return -1;
-                        } else if (binder.isUploadingNow(upload2)) {
-                            return 1;
-                        }
-                    }
-                } else if (upload2.getUploadStatus().equals(UploadStatus.UPLOAD_IN_PROGRESS)) {
-                    return 1;
-                }
-                if (upload1.getUploadEndTimestamp() == 0 || upload2.getUploadEndTimestamp() == 0) {
-                    return compareUploadId(upload1, upload2);
-                } else {
-                    return compareUpdateTime(upload1, upload2);
-                }
-            }
-
-            @SuppressFBWarnings("Bx")
-            private int compareUploadId(OCUpload upload1, OCUpload upload2) {
-                return Long.valueOf(upload1.getUploadId()).compareTo(upload2.getUploadId());
-            }
-
-            @SuppressFBWarnings("Bx")
-            private int compareUpdateTime(OCUpload upload1, OCUpload upload2) {
-                return Long.valueOf(upload2.getUploadEndTimestamp()).compareTo(upload1.getUploadEndTimestamp());
-            }
-        };
-    }
-
-    public ExpandableUploadListAdapter(FileActivity parentActivity) {
-        Log_OC.d(TAG, "ExpandableUploadListAdapter");
-        mParentActivity = parentActivity;
-        mUploadsStorageManager = new UploadsStorageManager(mParentActivity.getContentResolver(), parentActivity.getApplicationContext());
-        mUploadGroups = new UploadGroup[3];
-
-        mUploadGroups[0] = new UploadGroup(mParentActivity.getString(R.string.uploads_view_group_current_uploads)) {
-            @Override
-            public void refresh() {
-                setItems(mUploadsStorageManager.getCurrentAndPendingUploadsForCurrentAccount());
-                Arrays.sort(getItems(), comparator);
-            }
-        };
-
-        mUploadGroups[1] = new UploadGroup(mParentActivity.getString(R.string.uploads_view_group_failed_uploads)) {
-            @Override
-            public void refresh() {
-                setItems(mUploadsStorageManager.getFailedButNotDelayedUploadsForCurrentAccount());
-                Arrays.sort(getItems(), comparator);
-            }
-        };
-
-        mUploadGroups[2] = new UploadGroup(mParentActivity.getString(R.string.uploads_view_group_finished_uploads)) {
-            @Override
-            public void refresh() {
-                setItems(mUploadsStorageManager.getFinishedUploadsForCurrentAccount());
-                Arrays.sort(getItems(), comparator);
-            }
-        };
-        loadUploadItemsFromDb();
-    }
-
-    @Override
-    public void registerDataSetObserver(DataSetObserver observer) {
-        super.registerDataSetObserver(observer);
-        mUploadsStorageManager.addObserver(this);
-        Log_OC.d(TAG, "registerDataSetObserver");
-    }
-
-    @Override
-    public void unregisterDataSetObserver(DataSetObserver observer) {
-        super.unregisterDataSetObserver(observer);
-        mUploadsStorageManager.deleteObserver(this);
-        Log_OC.d(TAG, "unregisterDataSetObserver");
-    }
-
-    @Override
-    public boolean areAllItemsEnabled() {
-        return true;
-    }
-
-    private View getView(OCUpload[] uploadsItems, int position, View convertView, ViewGroup parent) {
-        View view = convertView;
-        if (view == null) {
-            LayoutInflater inflator =
-                    (LayoutInflater) mParentActivity.getSystemService(
-                            Context.LAYOUT_INFLATER_SERVICE
-                    );
-            view = inflator.inflate(R.layout.upload_list_item, parent, false);
-        }
-
-        if (uploadsItems != null && uploadsItems.length > position && uploadsItems[position] != null) {
-            final OCUpload upload = uploadsItems[position];
-
-            // local file name
-            TextView fileTextView = view.findViewById(R.id.upload_name);
-            File remoteFile = new File(upload.getRemotePath());
-            String fileName = remoteFile.getName();
-            if (fileName.length() == 0) {
-                fileName = File.separator;
-            }
-            fileTextView.setText(fileName);
-
-            // remote path to parent folder
-            TextView pathTextView = view.findViewById(R.id.upload_remote_path);
-            String remoteParentPath = new File(upload.getRemotePath()).getParent();
-            pathTextView.setText(remoteParentPath);
-
-            // file size
-            TextView fileSizeTextView = view.findViewById(R.id.upload_file_size);
-            if (upload.getFileSize() != 0) {
-                fileSizeTextView.setText(DisplayUtils.bytesToHumanReadable(upload.getFileSize()) + ", ");
-            } else {
-                fileSizeTextView.setText("");
-            }
-
-            //* upload date
-            TextView uploadDateTextView = view.findViewById(R.id.upload_date);
-            long updateTime = upload.getUploadEndTimestamp();
-            CharSequence dateString = DisplayUtils.getRelativeDateTimeString(
-                    mParentActivity,
-                    updateTime,
-                    DateUtils.SECOND_IN_MILLIS,
-                    DateUtils.WEEK_IN_MILLIS,
-                    0
-            );
-            uploadDateTextView.setText(dateString);
-
-            TextView accountNameTextView = view.findViewById(R.id.upload_account);
-            Account account = AccountUtils.getOwnCloudAccountByName(mParentActivity, upload.getAccountName());
-            if (account != null) {
-                accountNameTextView.setText(
-                        DisplayUtils.getAccountNameDisplayText(
-                                mParentActivity, account, account.name, upload.getAccountName())
-                );
-            } else {
-                accountNameTextView.setText(upload.getAccountName());
-            }
-
-            TextView statusTextView = view.findViewById(R.id.upload_status);
-
-            ProgressBar progressBar = view.findViewById(R.id.upload_progress_bar);
-
-            /// Reset fields visibility
-            uploadDateTextView.setVisibility(View.VISIBLE);
-            pathTextView.setVisibility(View.VISIBLE);
-
-            fileSizeTextView.setVisibility(View.VISIBLE);
-            accountNameTextView.setVisibility(View.VISIBLE);
-            statusTextView.setVisibility(View.VISIBLE);
-            progressBar.setVisibility(View.GONE);
-
-            /// Update information depending of upload details
-            String status = getStatusText(upload);
-            switch (upload.getUploadStatus()) {
-                case UPLOAD_IN_PROGRESS:
-                    ThemeUtils.colorHorizontalProgressBar(progressBar, ThemeUtils.primaryAccentColor());
-                    progressBar.setProgress(0);
-                    progressBar.setVisibility(View.VISIBLE);
-
-                    FileUploader.FileUploaderBinder binder = mParentActivity.getFileUploaderBinder();
-                    if (binder != null) {
-                        if (binder.isUploadingNow(upload)) {
-                            /// really uploading, so...
-                            /// ... unbind the old progress bar, if any; ...
-                            if (mProgressListener != null) {
-                                binder.removeDatatransferProgressListener(
-                                        mProgressListener,
-                                        mProgressListener.getUpload()   // the one that was added
-                                );
-                            }
-                            /// ... then, bind the current progress bar to listen for updates
-                            mProgressListener = new ProgressListener(upload, progressBar);
-                            binder.addDatatransferProgressListener(
-                                    mProgressListener,
-                                    upload
-                            );
-
-                        } else {
-                            /// not really uploading; stop listening progress if view is reused!
-                            if (convertView != null &&
-                                    mProgressListener != null &&
-                                    mProgressListener.isWrapping(progressBar)) {
-                                binder.removeDatatransferProgressListener(
-                                        mProgressListener,
-                                        mProgressListener.getUpload()   // the one that was added
-                                );
-                                mProgressListener = null;
-                            }
-                        }
-                    } else {
-                        Log_OC.w(
-                                TAG,
-                                "FileUploaderBinder not ready yet for upload " + upload.getRemotePath()
-                        );
-                    }
-                    uploadDateTextView.setVisibility(View.GONE);
-                    fileSizeTextView.setVisibility(View.GONE);
-                    progressBar.invalidate();
-                    break;
-
-                case UPLOAD_FAILED:
-                    uploadDateTextView.setVisibility(View.GONE);
-                    break;
-
-                case UPLOAD_SUCCEEDED:
-                    statusTextView.setVisibility(View.GONE);
-                    break;
-            }
-            statusTextView.setText(status);
-
-            /// bind listeners to perform actions
-            /// bind listeners to perform actions
-            ImageButton rightButton = view.findViewById(R.id.upload_right_button);
-            if (upload.getUploadStatus() == UploadStatus.UPLOAD_IN_PROGRESS) {
-                //Cancel
-                rightButton.setImageResource(R.drawable.ic_action_cancel_grey);
-                rightButton.setVisibility(View.VISIBLE);
-                rightButton.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        FileUploader.FileUploaderBinder uploaderBinder = mParentActivity.getFileUploaderBinder();
-                        if (uploaderBinder != null) {
-                            uploaderBinder.cancel(upload);
-                            refreshView();
-                        }
-                    }
-                });
-
-            } else if (upload.getUploadStatus() == UploadStatus.UPLOAD_FAILED) {
-                //Delete
-                rightButton.setImageResource(R.drawable.ic_action_delete_grey);
-                rightButton.setVisibility(View.VISIBLE);
-                rightButton.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        mUploadsStorageManager.removeUpload(upload);
-                        refreshView();
-                    }
-                });
-
-            } else {    // UploadStatus.UPLOAD_SUCCESS
-                rightButton.setVisibility(View.INVISIBLE);
-            }
-            
-            view.setOnClickListener(null);
-
-            // retry
-            if (upload.getUploadStatus() == UploadStatus.UPLOAD_FAILED) {
-                if (UploadResult.CREDENTIAL_ERROR.equals(upload.getLastResult())) {
-                    view.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            mParentActivity.getFileOperationsHelper().checkCurrentCredentials(
-                                upload.getAccount(mParentActivity)
-                            );
-                        }
-                    });
-
-                } else {
-                    // not a credentials error
-                    view.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                        File file = new File(upload.getLocalPath());
-                        if (file.exists()) {
-                            FileUploader.UploadRequester requester = new FileUploader.UploadRequester();
-                            requester.retry(mParentActivity, upload);
-                            refreshView();
-                        } else {
-                            Snackbar.make(
-                                    v.getRootView().findViewById(android.R.id.content),
-                                    mParentActivity.getString(R.string.local_file_not_found_toast),
-                                    Snackbar.LENGTH_LONG
-                            ).show();
-                        }
-                        }
-                    });
-                }
-            } else {
-                view.setOnClickListener(null);
-            }
-
-            /// Set icon or thumbnail
-            ImageView fileIcon = view.findViewById(R.id.thumbnail);
-            fileIcon.setImageResource(R.drawable.file);
-
-            /*
-             * Cancellation needs do be checked and done before changing the drawable in fileIcon, or
-             * {@link ThumbnailsCacheManager#cancelPotentialWork} will NEVER cancel any task.
-             */
-            OCFile fakeFileToCheatThumbnailsCacheManagerInterface = new OCFile(upload.getRemotePath());
-            fakeFileToCheatThumbnailsCacheManagerInterface.setStoragePath(upload.getLocalPath());
-            fakeFileToCheatThumbnailsCacheManagerInterface.setMimetype(upload.getMimeType());
-
-            boolean allowedToCreateNewThumbnail = (ThumbnailsCacheManager.cancelPotentialThumbnailWork(
-                    fakeFileToCheatThumbnailsCacheManagerInterface,
-                    fileIcon)
-            );
-
-            // TODO this code is duplicated; refactor to a common place
-            if ((MimeTypeUtil.isImage(fakeFileToCheatThumbnailsCacheManagerInterface)
-                    && fakeFileToCheatThumbnailsCacheManagerInterface.getRemoteId() != null &&
-                    upload.getUploadStatus() == UploadStatus.UPLOAD_SUCCEEDED)) {
-                // Thumbnail in Cache?
-                Bitmap thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(
-                        String.valueOf(fakeFileToCheatThumbnailsCacheManagerInterface.getRemoteId())
-                );
-                if (thumbnail != null && !fakeFileToCheatThumbnailsCacheManagerInterface.needsUpdateThumbnail()) {
-                    fileIcon.setImageBitmap(thumbnail);
-                } else {
-                    // generate new Thumbnail
-                    if (allowedToCreateNewThumbnail) {
-                        final ThumbnailsCacheManager.ThumbnailGenerationTask task =
-                                new ThumbnailsCacheManager.ThumbnailGenerationTask(
-                                        fileIcon, mParentActivity.getStorageManager(), mParentActivity.getAccount()
-                                );
-                        if (thumbnail == null) {
-                            if (MimeTypeUtil.isVideo(fakeFileToCheatThumbnailsCacheManagerInterface)) {
-                                thumbnail = ThumbnailsCacheManager.mDefaultVideo;
-                            } else {
-                                thumbnail = ThumbnailsCacheManager.mDefaultImg;
-                            }
-                        }
-                        final ThumbnailsCacheManager.AsyncThumbnailDrawable asyncDrawable =
-                                new ThumbnailsCacheManager.AsyncThumbnailDrawable(
-                                        mParentActivity.getResources(),
-                                        thumbnail,
-                                        task
-                                );
-                        fileIcon.setImageDrawable(asyncDrawable);
-                        task.execute(new ThumbnailsCacheManager.ThumbnailGenerationTaskObject(
-                                fakeFileToCheatThumbnailsCacheManagerInterface, null));
-                    }
-                }
-
-                if ("image/png".equals(upload.getMimeType())) {
-                    fileIcon.setBackgroundColor(mParentActivity.getResources()
-                            .getColor(R.color.background_color));
-                }
-
-
-            } else if (MimeTypeUtil.isImage(fakeFileToCheatThumbnailsCacheManagerInterface)) {
-                File file = new File(upload.getLocalPath());
-                // Thumbnail in Cache?
-                Bitmap thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(
-                        String.valueOf(file.hashCode()));
-                if (thumbnail != null) {
-                    fileIcon.setImageBitmap(thumbnail);
-                } else {
-                    // generate new Thumbnail
-                    if (allowedToCreateNewThumbnail) {
-                        final ThumbnailsCacheManager.ThumbnailGenerationTask task =
-                                new ThumbnailsCacheManager.ThumbnailGenerationTask(fileIcon);
-                        if (thumbnail == null) {
-                            if (MimeTypeUtil.isVideo(file)) {
-                                thumbnail = ThumbnailsCacheManager.mDefaultVideo;
-                            } else {
-                                thumbnail = ThumbnailsCacheManager.mDefaultImg;
-                            }
-                        }
-                        final ThumbnailsCacheManager.AsyncThumbnailDrawable asyncDrawable =
-                                new ThumbnailsCacheManager.AsyncThumbnailDrawable(
-                                        mParentActivity.getResources(),
-                                        thumbnail,
-                                        task
-                                );
-                        fileIcon.setImageDrawable(asyncDrawable);
-                        task.execute(new ThumbnailsCacheManager.ThumbnailGenerationTaskObject(file, null));
-                        Log_OC.v(TAG, "Executing task to generate a new thumbnail");
-                    }
-                }
-
-                if ("image/png".equalsIgnoreCase(upload.getMimeType())) {
-                    fileIcon.setBackgroundColor(mParentActivity.getResources()
-                            .getColor(R.color.background_color));
-                }
-            } else {
-                fileIcon.setImageDrawable(MimeTypeUtil.getFileTypeIcon(upload.getMimeType(), fileName, account));
-            }
-        }
-
-        return view;
-    }
-
-    /**
-     * Gets the status text to show to the user according to the status and last result of the
-     * the given upload.
-     *
-     * @param upload        Upload to describe.
-     * @return Text describing the status of the given upload.
-     */
-    private String getStatusText(OCUpload upload) {
-
-        String status;
-        switch (upload.getUploadStatus()) {
-
-            case UPLOAD_IN_PROGRESS:
-                status = mParentActivity.getString(R.string.uploads_view_later_waiting_to_upload);
-                FileUploader.FileUploaderBinder binder = mParentActivity.getFileUploaderBinder();
-                if (binder != null && binder.isUploadingNow(upload)) {
-                    /// really uploading, bind the progress bar to listen for progress updates
-                    status = mParentActivity.getString(R.string.uploader_upload_in_progress_ticker);
-                }
-                break;
-
-            case UPLOAD_SUCCEEDED:
-                status = mParentActivity.getString(R.string.uploads_view_upload_status_succeeded);
-                break;
-
-            case UPLOAD_FAILED:
-                switch (upload.getLastResult()) {
-                    case CREDENTIAL_ERROR:
-                        status = mParentActivity.getString(
-                                R.string.uploads_view_upload_status_failed_credentials_error
-                        );
-                        break;
-                    case FOLDER_ERROR:
-                        status = mParentActivity.getString(
-                                R.string.uploads_view_upload_status_failed_folder_error
-                        );
-                        break;
-                    case FILE_NOT_FOUND:
-                        status = mParentActivity.getString(
-                                R.string.uploads_view_upload_status_failed_localfile_error
-                        );
-                        break;
-                    case FILE_ERROR:
-                        status = mParentActivity.getString(
-                                R.string.uploads_view_upload_status_failed_file_error
-                        );
-                        break;
-                    case PRIVILEDGES_ERROR:
-                        status = mParentActivity.getString(
-                                R.string.uploads_view_upload_status_failed_permission_error
-                        );
-                        break;
-                    case NETWORK_CONNECTION:
-                        status = mParentActivity.getString(
-                                R.string.uploads_view_upload_status_failed_connection_error
-                        );
-                        break;
-                    case DELAYED_FOR_WIFI:
-                        status = mParentActivity.getString(
-                                R.string.uploads_view_upload_status_waiting_for_wifi
-                        );
-                        break;
-                    case DELAYED_FOR_CHARGING:
-                        status = mParentActivity.getString(
-                                R.string.uploads_view_upload_status_waiting_for_charging);
-                        break;
-                    case CONFLICT_ERROR:
-                        status = mParentActivity.getString(
-                                R.string.uploads_view_upload_status_conflict
-                        );
-                        break;
-                    case SERVICE_INTERRUPTED:
-                        status = mParentActivity.getString(
-                                R.string.uploads_view_upload_status_service_interrupted
-                        );
-                        break;
-                    case CANCELLED:
-                        // should not get here ; cancelled uploads should be wiped out
-                        status = mParentActivity.getString(
-                                R.string.uploads_view_upload_status_cancelled
-                        );
-                        break;
-                    case UPLOADED:
-                        // should not get here ; status should be UPLOAD_SUCCESS
-                        status = mParentActivity.getString(R.string.uploads_view_upload_status_succeeded);
-                        break;
-                    case MAINTENANCE_MODE:
-                        status = mParentActivity.getString(R.string.maintenance_mode);
-                        break;
-                    case SSL_RECOVERABLE_PEER_UNVERIFIED:
-                        status =
-                                mParentActivity.getString(
-                                        R.string.uploads_view_upload_status_failed_ssl_certificate_not_trusted
-                                );
-                        break;
-                    case UNKNOWN:
-                        status = mParentActivity.getString(R.string.uploads_view_upload_status_unknown_fail);
-                        break;
-                    case DELAYED_IN_POWER_SAVE_MODE:
-                        status = mParentActivity.getString(
-                                R.string.uploads_view_upload_status_waiting_exit_power_save_mode);
-                        break;
-                    default:
-                        status = "New fail result but no description for the user";
-                        break;
-                }
-                break;
-
-            default:
-                status = "Uncontrolled status: " + upload.getUploadStatus().toString();
-        }
-        return status;
-    }
-
-
-    @Override
-    public boolean hasStableIds() {
-        return false;
-    }
-
-
-    /**
-     * Load upload items from {@link UploadsStorageManager}.
-     */
-    private void loadUploadItemsFromDb() {
-        Log_OC.d(TAG, "loadUploadItemsFromDb");
-
-        for (UploadGroup group : mUploadGroups) {
-            group.refresh();
-        }
-
-        notifyDataSetChanged();
-    }
-
-    @Override
-    public void update(Observable arg0, Object arg1) {
-        Log_OC.d(TAG, "update");
-        loadUploadItemsFromDb();
-    }
-
-
-    public void refreshView() {
-        Log_OC.d(TAG, "refreshView");
-        loadUploadItemsFromDb();
-    }
-
-    @Override
-    public Object getChild(int groupPosition, int childPosition) {
-        return mUploadGroups[(int) getGroupId(groupPosition)].items[childPosition];
-    }
-
-    @Override
-    public long getChildId(int groupPosition, int childPosition) {
-        return childPosition;
-    }
-
-    @Override
-    public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView,
-                             ViewGroup parent) {
-        return getView(mUploadGroups[(int) getGroupId(groupPosition)].items, childPosition, convertView, parent);
-    }
-
-    @Override
-    public int getChildrenCount(int groupPosition) {
-        return mUploadGroups[(int) getGroupId(groupPosition)].items.length;
-    }
-
-    @Override
-    public Object getGroup(int groupPosition) {
-        return mUploadGroups[(int) getGroupId(groupPosition)];
-    }
-
-    @Override
-    public int getGroupCount() {
-        int size = 0;
-        for (UploadGroup uploadGroup : mUploadGroups) {
-            if (uploadGroup.items.length > 0) {
-                size++;
-            }
-        }
-        return size;
-    }
-
-    /**
-     * Returns the groupId (that is, index in mUploadGroups) for group at position groupPosition (0-based).
-     * Could probably be done more intuitive but this tested methods works as intended.
-     */
-    @Override
-    public long getGroupId(int groupPosition) {
-        int id = -1;
-        for (int i = 0; i <= groupPosition; ) {
-            id++;
-            if (mUploadGroups[id].items.length > 0) {
-                i++;
-            }
-        }
-        return id;
-    }
-
-    @Override
-    public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) {
-        //force group to stay unfolded
-        ExpandableListView listView = (ExpandableListView) parent;
-        listView.expandGroup(groupPosition);
-
-        listView.setGroupIndicator(null);
-        UploadGroup group = (UploadGroup) getGroup(groupPosition);
-        if (convertView == null) {
-            LayoutInflater inflaInflater = (LayoutInflater) mParentActivity
-                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-            convertView = inflaInflater.inflate(R.layout.upload_list_group, null);
-        }
-        TextView tv = convertView.findViewById(R.id.uploadListGroupName);
-        tv.setText(String.format(mParentActivity.getString(R.string.uploads_view_group_header),
-                group.getGroupName(), group.getGroupItemCount()));
-        tv.setTextColor(ThemeUtils.primaryAccentColor());
-        return convertView;
-    }
-
-    @Override
-    public boolean isChildSelectable(int groupPosition, int childPosition) {
-        return true;
-    }
-
-    public void addBinder() {
-        notifyDataSetChanged();
-    }
-}

src/main/java/com/owncloud/android/ui/adapter/FileListListAdapter.java

@@ -1,778 +0,0 @@
-/*
- * ownCloud Android client application
- *
- * @author Bartek Przybylski
- * @author Tobias Kaminsky
- * @author David A. Velasco
- * @author masensio
- * Copyright (C) 2011  Bartek Przybylski
- * Copyright (C) 2016 ownCloud Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.owncloud.android.ui.adapter;
-
-
-import android.accounts.Account;
-import android.content.ContentValues;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Color;
-import android.os.Handler;
-import android.os.Looper;
-import android.text.TextUtils;
-import android.util.SparseBooleanArray;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AbsListView;
-import android.widget.BaseAdapter;
-import android.widget.Filter;
-import android.widget.GridView;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.owncloud.android.R;
-import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.datamodel.FileDataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.datamodel.ThumbnailsCacheManager;
-import com.owncloud.android.datamodel.VirtualFolderType;
-import com.owncloud.android.db.PreferenceManager;
-import com.owncloud.android.db.ProviderMeta;
-import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
-import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.lib.resources.files.ReadRemoteFileOperation;
-import com.owncloud.android.lib.resources.files.RemoteFile;
-import com.owncloud.android.lib.resources.shares.OCShare;
-import com.owncloud.android.lib.resources.shares.ShareType;
-import com.owncloud.android.operations.RemoteOperationFailedException;
-import com.owncloud.android.services.OperationsService.OperationsServiceBinder;
-import com.owncloud.android.ui.activity.ComponentsGetter;
-import com.owncloud.android.ui.fragment.ExtendedListFragment;
-import com.owncloud.android.ui.interfaces.OCFileListFragmentInterface;
-import com.owncloud.android.utils.DisplayUtils;
-import com.owncloud.android.utils.FileSortOrder;
-import com.owncloud.android.utils.FileStorageUtils;
-import com.owncloud.android.utils.MimeTypeUtil;
-import com.owncloud.android.utils.ThemeUtils;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Locale;
-import java.util.Vector;
-
-
-/**
- * This Adapter populates a ListView with all files and folders in an ownCloud
- * instance.
- */
-public class FileListListAdapter extends BaseAdapter {
-
-    public static final int showFilenameColumnThreshold = 4;
-    private Context mContext;
-    private Vector<OCFile> mFilesAll = new Vector<>();
-    private Vector<OCFile> mFiles = new Vector<>();
-    private boolean mJustFolders;
-    private boolean mHideItemOptions;
-
-    private FileDataStorageManager mStorageManager;
-    private Account mAccount;
-    private ComponentsGetter mTransferServiceGetter;
-    private OCFileListFragmentInterface OCFileListFragmentInterface;
-
-    private FilesFilter mFilesFilter;
-    private OCFile currentDirectory;
-    private static final String TAG = FileListListAdapter.class.getSimpleName();
-
-    private ArrayList<ThumbnailsCacheManager.ThumbnailGenerationTask> asyncTasks = new ArrayList<>();
-
-    public FileListListAdapter(Context context, ComponentsGetter transferServiceGetter,
-                               OCFileListFragmentInterface OCFileListFragmentInterface, boolean argHideItemOptions) {
-
-        this.OCFileListFragmentInterface = OCFileListFragmentInterface;
-        mContext = context;
-        mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);
-        mHideItemOptions = argHideItemOptions;
-
-        mTransferServiceGetter = transferServiceGetter;
-
-        // initialise thumbnails cache on background thread
-        new ThumbnailsCacheManager.InitDiskCacheTask().execute();
-    }
-
-    @Override
-    public boolean areAllItemsEnabled() {
-        return true;
-    }
-
-    @Override
-    public boolean isEnabled(int position) {
-        return true;
-    }
-
-    @Override
-    public int getCount() {
-        return mFiles != null ? mFiles.size() : 0;
-    }
-
-    @Override
-    public Object getItem(int position) {
-        if (mFiles == null || mFiles.size() <= position) {
-            return null;
-        }
-        return mFiles.get(position);
-    }
-
-    public void setFavoriteAttributeForItemID(String fileId, boolean favorite) {
-        for (int i = 0; i < mFiles.size(); i++) {
-            if (mFiles.get(i).getRemoteId().equals(fileId)) {
-                mFiles.get(i).setFavorite(favorite);
-                break;
-            }
-        }
-
-        for (int i = 0; i < mFilesAll.size(); i++) {
-            if (mFilesAll.get(i).getRemoteId().equals(fileId)) {
-                mFilesAll.get(i).setFavorite(favorite);
-                break;
-            }
-        }
-
-        new Handler(Looper.getMainLooper()).post(new Runnable() {
-            @Override
-            public void run() {
-                notifyDataSetChanged();
-            }
-        });
-    }
-
-    public void setEncryptionAttributeForItemID(String fileId, boolean encrypted) {
-        for (int i = 0; i < mFiles.size(); i++) {
-            if (mFiles.get(i).getRemoteId().equals(fileId)) {
-                mFiles.get(i).setEncrypted(encrypted);
-                break;
-            }
-        }
-
-        for (int i = 0; i < mFilesAll.size(); i++) {
-            if (mFilesAll.get(i).getRemoteId().equals(fileId)) {
-                mFilesAll.get(i).setEncrypted(encrypted);
-                break;
-            }
-        }
-
-        new Handler(Looper.getMainLooper()).post(new Runnable() {
-            @Override
-            public void run() {
-                notifyDataSetChanged();
-            }
-        });
-    }
-
-    @Override
-    public long getItemId(int position) {
-        if (mFiles == null || mFiles.size() <= position) {
-            return 0;
-        }
-        return mFiles.get(position).getFileId();
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        return 0;
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-
-        View view = convertView;
-        OCFile file = null;
-        LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-
-        if (mFiles != null && mFiles.size() > position) {
-            file = mFiles.get(position);
-        }
-
-        // Find out which layout should be displayed
-        ViewType viewType;
-        if (parent instanceof GridView) {
-            if (file != null && (MimeTypeUtil.isImage(file) || MimeTypeUtil.isVideo(file))) {
-                viewType = ViewType.GRID_IMAGE;
-            } else {
-                viewType = ViewType.GRID_ITEM;
-            }
-        } else {
-            viewType = ViewType.LIST_ITEM;
-        }
-
-        // create view only if differs, otherwise reuse
-        if (convertView == null || convertView.getTag() != viewType) {
-            switch (viewType) {
-                case GRID_IMAGE:
-                    view = inflater.inflate(R.layout.grid_image, parent, false);
-                    view.setTag(ViewType.GRID_IMAGE);
-                    break;
-                case GRID_ITEM:
-                    view = inflater.inflate(R.layout.grid_item, parent, false);
-                    view.setTag(ViewType.GRID_ITEM);
-                    break;
-                case LIST_ITEM:
-                    view = inflater.inflate(R.layout.list_item, parent, false);
-                    view.setTag(ViewType.LIST_ITEM);
-                    break;
-            }
-        }
-
-        if (file != null) {
-            ImageView fileIcon = view.findViewById(R.id.thumbnail);
-
-            fileIcon.setTag(file.getFileId());
-            TextView fileName;
-            String name = file.getFileName();
-
-            switch (viewType) {
-                case LIST_ITEM:
-                    TextView fileSizeV = view.findViewById(R.id.file_size);
-                    TextView fileSizeSeparatorV = view.findViewById(R.id.file_separator);
-                    TextView lastModV = view.findViewById(R.id.last_mod);
-
-
-                    lastModV.setVisibility(View.VISIBLE);
-                    lastModV.setText(DisplayUtils.getRelativeTimestamp(mContext, file.getModificationTimestamp()));
-
-
-                    fileSizeSeparatorV.setVisibility(View.VISIBLE);
-                    fileSizeV.setVisibility(View.VISIBLE);
-                    fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));
-
-                case GRID_ITEM:
-                    // filename
-                    fileName = view.findViewById(R.id.Filename);
-                    fileName.setText(name);
-
-                    if (OCFileListFragmentInterface.getColumnSize() > showFilenameColumnThreshold
-                            && viewType == ViewType.GRID_ITEM) {
-                        fileName.setVisibility(View.GONE);
-                    }
-
-                case GRID_IMAGE:
-
-                    // local state
-                    ImageView localStateView = view.findViewById(R.id.localFileIndicator);
-                    localStateView.bringToFront();
-                    FileDownloaderBinder downloaderBinder = mTransferServiceGetter.getFileDownloaderBinder();
-                    FileUploaderBinder uploaderBinder = mTransferServiceGetter.getFileUploaderBinder();
-                    OperationsServiceBinder opsBinder = mTransferServiceGetter.getOperationsServiceBinder();
-
-                    localStateView.setVisibility(View.INVISIBLE);   // default first
-
-                    if (opsBinder != null && opsBinder.isSynchronizing(mAccount, file)) {
-                        //synchronizing
-                        localStateView.setImageResource(R.drawable.ic_synchronizing);
-                        localStateView.setVisibility(View.VISIBLE);
-
-                    } else if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, file)) {
-                        // downloading
-                        localStateView.setImageResource(R.drawable.ic_synchronizing);
-                        localStateView.setVisibility(View.VISIBLE);
-
-                    } else if (uploaderBinder != null && uploaderBinder.isUploading(mAccount, file)) {
-                        //uploading
-                        localStateView.setImageResource(R.drawable.ic_synchronizing);
-                        localStateView.setVisibility(View.VISIBLE);
-
-                    } else if (file.getEtagInConflict() != null) {
-                        // conflict
-                        localStateView.setImageResource(R.drawable.ic_synchronizing_error);
-                        localStateView.setVisibility(View.VISIBLE);
-
-                    } else if (file.isDown()) {
-                        localStateView.setImageResource(R.drawable.ic_synced);
-                        localStateView.setVisibility(View.VISIBLE);
-                    }
-
-                    break;
-            }
-
-            // For all Views
-            if (file.getIsFavorite()) {
-                view.findViewById(R.id.favorite_action).setVisibility(View.VISIBLE);
-            } else {
-                view.findViewById(R.id.favorite_action).setVisibility(View.GONE);
-            }
-
-            ImageView checkBoxV = view.findViewById(R.id.custom_checkbox);
-            view.setBackgroundColor(Color.WHITE);
-
-            AbsListView parentList = (AbsListView) parent;
-
-            if (parentList.getChoiceMode() != AbsListView.CHOICE_MODE_NONE && parentList.getCheckedItemCount() > 0) {
-                if (parentList.isItemChecked(position)) {
-                    view.setBackgroundColor(mContext.getResources().getColor(R.color.selected_item_background));
-                    checkBoxV.setImageDrawable(ThemeUtils.tintDrawable(R.drawable.ic_checkbox_marked,
-                            ThemeUtils.primaryColor()));
-                } else {
-                    view.setBackgroundColor(Color.WHITE);
-                    checkBoxV.setImageResource(R.drawable.ic_checkbox_blank_outline);
-                }
-                checkBoxV.setVisibility(View.VISIBLE);
-                hideShareIcon(view);
-                hideOverflowMenuIcon(view, viewType);
-            } else {
-                checkBoxV.setVisibility(View.GONE);
-
-                if (mHideItemOptions) {
-                    ImageView sharedIconView = view.findViewById(R.id.sharedIcon);
-                    sharedIconView.setVisibility(View.GONE);
-
-                    ImageView overflowIndicatorView = view.findViewById(R.id.overflow_menu);
-                    overflowIndicatorView.setVisibility(View.GONE);
-                } else {
-                    showShareIcon(view, file);
-                    showOverflowMenuIcon(view, file, viewType);
-                }
-            }
-
-            // this if-else is needed even though kept-in-sync icon is visible by default
-            // because android reuses views in listview
-            if (!file.isAvailableOffline()) {
-                view.findViewById(R.id.keptOfflineIcon).setVisibility(View.GONE);
-            } else {
-                view.findViewById(R.id.keptOfflineIcon).setVisibility(View.VISIBLE);
-            }
-
-
-            // No Folder
-            if (!file.isFolder()) {
-                if ((MimeTypeUtil.isImage(file) || MimeTypeUtil.isVideo(file)) && file.getRemoteId() != null) {
-                    // Thumbnail in Cache?
-                    Bitmap thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(
-                            ThumbnailsCacheManager.PREFIX_THUMBNAIL + String.valueOf(file.getRemoteId())
-                    );
-                    if (thumbnail != null && !file.needsUpdateThumbnail()) {
-
-                        if (MimeTypeUtil.isVideo(file)) {
-                            Bitmap withOverlay = ThumbnailsCacheManager.addVideoOverlay(thumbnail);
-                            fileIcon.setImageBitmap(withOverlay);
-                        } else {
-                            fileIcon.setImageBitmap(thumbnail);
-                        }
-                    } else {
-                        // generate new Thumbnail
-                        if (ThumbnailsCacheManager.cancelPotentialThumbnailWork(file, fileIcon)) {
-                            try {
-                                final ThumbnailsCacheManager.ThumbnailGenerationTask task =
-                                        new ThumbnailsCacheManager.ThumbnailGenerationTask(
-                                                fileIcon, mStorageManager, mAccount, asyncTasks);
-
-                                if (thumbnail == null) {
-                                    if (MimeTypeUtil.isVideo(file)) {
-                                        thumbnail = ThumbnailsCacheManager.mDefaultVideo;
-                                    } else {
-                                        thumbnail = ThumbnailsCacheManager.mDefaultImg;
-                                    }
-                                }
-                                final ThumbnailsCacheManager.AsyncThumbnailDrawable asyncDrawable =
-                                        new ThumbnailsCacheManager.AsyncThumbnailDrawable(
-                                                mContext.getResources(),
-                                                thumbnail,
-                                                task
-                                        );
-                                fileIcon.setImageDrawable(asyncDrawable);
-                                asyncTasks.add(task);
-                                task.execute(new ThumbnailsCacheManager.ThumbnailGenerationTaskObject(file,
-                                        file.getRemoteId()));
-                            } catch (IllegalArgumentException e) {
-                                Log_OC.d(TAG, "ThumbnailGenerationTask : " + e.getMessage());
-                            }
-                        }
-                    }
-
-                    if (file.getMimetype().equalsIgnoreCase("image/png")) {
-                        fileIcon.setBackgroundColor(mContext.getResources().getColor(R.color.background_color));
-                    }
-
-
-                } else {
-                    fileIcon.setImageDrawable(
-                            MimeTypeUtil.getFileTypeIcon(file.getMimetype(), file.getFileName(), mAccount)
-                    );
-                }
-
-
-            } else {
-                // Folder
-                fileIcon.setImageDrawable(MimeTypeUtil.getFolderTypeIcon(file.isSharedWithMe() ||
-                        file.isSharedWithSharee(), file.isSharedViaLink(), file.isEncrypted(), file.getMountType()));
-            }
-        }
-        return view;
-    }
-
-    private void showShareIcon(View view, OCFile file) {
-        ImageView sharedIconV = view.findViewById(R.id.sharedIcon);
-        sharedIconV.setVisibility(View.VISIBLE);
-        if (file.isSharedWithSharee() || file.isSharedWithMe()) {
-            sharedIconV.setImageResource(R.drawable.shared_via_users);
-        } else if (file.isSharedViaLink()) {
-            sharedIconV.setImageResource(R.drawable.shared_via_link);
-        } else {
-            sharedIconV.setImageResource(R.drawable.ic_unshared);
-        }
-        sharedIconV.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                OCFileListFragmentInterface.onShareIconClick(file);
-            }
-        });
-    }
-
-    private void hideShareIcon(View view) {
-        view.findViewById(R.id.sharedIcon).setVisibility(View.GONE);
-    }
-
-    private void showOverflowMenuIcon(View view, OCFile file, ViewType viewType) {
-        if (ViewType.LIST_ITEM.equals(viewType)) {
-            ImageView overflowIndicatorV = view.findViewById(R.id.overflow_menu);
-            overflowIndicatorV.setVisibility(View.VISIBLE);
-            overflowIndicatorV.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    OCFileListFragmentInterface.onOverflowIconClick(v, file);
-                }
-            });
-        }
-    }
-
-    private void hideOverflowMenuIcon(View view, ViewType viewType) {
-        if (ViewType.LIST_ITEM.equals(viewType)) {
-            ImageView overflowIndicatorV = view.findViewById(R.id.overflow_menu);
-            overflowIndicatorV.setVisibility(View.GONE);
-        }
-    }
-
-    @Override
-    public int getViewTypeCount() {
-        return 1;
-    }
-
-    @Override
-    public boolean hasStableIds() {
-        return true;
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return (mFiles == null || mFiles.isEmpty());
-    }
-
-    /**
-     * Change the adapted directory for a new one
-     *
-     * @param directory             New folder to adapt. Can be NULL, meaning
-     *                              "no content to adapt".
-     * @param updatedStorageManager Optional updated storage manager; used to replace
-     *                              mStorageManager if is different (and not NULL)
-     */
-    public void swapDirectory(OCFile directory, FileDataStorageManager updatedStorageManager
-            , boolean onlyOnDevice) {
-        if (updatedStorageManager != null && !updatedStorageManager.equals(mStorageManager)) {
-            mStorageManager = updatedStorageManager;
-            mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);
-        }
-        if (mStorageManager != null) {
-            mFiles = mStorageManager.getFolderContent(directory, onlyOnDevice);
-
-            if (mJustFolders) {
-                mFiles = getFolders(mFiles);
-            }
-            if (!PreferenceManager.showHiddenFilesEnabled(mContext)) {
-                mFiles = filterHiddenFiles(mFiles);
-            }
-            FileSortOrder sortOrder = PreferenceManager.getSortOrder(mContext, directory);
-            mFiles = sortOrder.sortCloudFiles(mFiles);
-            mFilesAll.clear();
-            mFilesAll.addAll(mFiles);
-
-            currentDirectory = directory;
-        } else {
-            mFiles.clear();
-            mFilesAll.clear();
-        }
-
-        notifyDataSetChanged();
-    }
-
-    private void searchForLocalFileInDefaultPath(OCFile file) {
-        if (file.getStoragePath() == null && !file.isFolder()) {
-            File f = new File(FileStorageUtils.getDefaultSavePathFor(mAccount.name, file));
-            if (f.exists()) {
-                file.setStoragePath(f.getAbsolutePath());
-                file.setLastSyncDateForData(f.lastModified());
-            }
-        }
-    }
-
-    public void setData(ArrayList<Object> objects, ExtendedListFragment.SearchType searchType,
-                        FileDataStorageManager storageManager, OCFile folder) {
-        if (storageManager != null && mStorageManager == null) {
-            mStorageManager = storageManager;
-        }
-        mFiles.clear();
-
-        // early exit
-        if (objects.size() > 0 && mStorageManager != null) {
-            if (searchType.equals(ExtendedListFragment.SearchType.SHARED_FILTER)) {
-                parseShares(objects);
-            } else {
-                parseVirtuals(objects, searchType);
-            }
-        }
-
-        if (!searchType.equals(ExtendedListFragment.SearchType.PHOTO_SEARCH) &&
-                !searchType.equals(ExtendedListFragment.SearchType.PHOTOS_SEARCH_FILTER) &&
-                !searchType.equals(ExtendedListFragment.SearchType.RECENTLY_MODIFIED_SEARCH) &&
-                !searchType.equals(ExtendedListFragment.SearchType.RECENTLY_MODIFIED_SEARCH_FILTER)) {
-            FileSortOrder sortOrder = PreferenceManager.getSortOrder(mContext, folder);
-            mFiles = sortOrder.sortCloudFiles(mFiles);
-        } else {
-            mFiles = FileStorageUtils.sortOcFolderDescDateModified(mFiles);
-        }
-
-        mFilesAll = new Vector<>();
-        mFilesAll.addAll(mFiles);
-
-        new Handler(Looper.getMainLooper()).post(new Runnable() {
-            @Override
-            public void run() {
-                notifyDataSetChanged();
-                OCFileListFragmentInterface.finishedFiltering();
-            }
-        });
-    }
-
-    private void parseShares(ArrayList<Object> objects) {
-        ArrayList<OCShare> shares = new ArrayList<>();
-        for (int i = 0; i < objects.size(); i++) {
-            // check type before cast as of long running data fetch it is possible that old result is filled
-            if (objects.get(i) instanceof OCShare) {
-                OCShare ocShare = (OCShare) objects.get(i);
-
-                shares.add(ocShare);
-
-                // get ocFile from Server to have an up-to-date copy
-                ReadRemoteFileOperation operation = new ReadRemoteFileOperation(ocShare.getPath());
-                RemoteOperationResult result = operation.execute(mAccount, mContext);
-                if (result.isSuccess()) {
-                    OCFile file = FileStorageUtils.fillOCFile((RemoteFile) result.getData().get(0));
-                    searchForLocalFileInDefaultPath(file);
-                    file = mStorageManager.saveFileWithParent(file, mContext);
-
-                    ShareType newShareType = ocShare.getShareType();
-                    if (newShareType == ShareType.PUBLIC_LINK) {
-                        file.setShareViaLink(true);
-                    } else if (newShareType == ShareType.USER || newShareType == ShareType.GROUP ||
-                                    newShareType == ShareType.EMAIL || newShareType == ShareType.FEDERATED) {
-                        file.setShareWithSharee(true);
-                    }
-
-                    mStorageManager.saveFile(file);
-
-                    if (!mFiles.contains(file)) {
-                        mFiles.add(file);
-                    }
-                } else {
-                    Log_OC.e(TAG, "Error in getting prop for file: " + ocShare.getPath());
-                }
-            }
-        }
-        mStorageManager.saveShares(shares);
-    }
-
-    private void parseVirtuals(ArrayList<Object> objects, ExtendedListFragment.SearchType searchType) {
-        VirtualFolderType type;
-        boolean onlyImages = false;
-        switch (searchType) {
-            case FAVORITE_SEARCH:
-                type = VirtualFolderType.FAVORITE;
-                break;
-            case PHOTO_SEARCH:
-                type = VirtualFolderType.PHOTOS;
-                onlyImages = true;
-                break;
-            default:
-                type = VirtualFolderType.NONE;
-                break;
-        }
-
-        mStorageManager.deleteVirtuals(type);
-
-        ArrayList<ContentValues> contentValues = new ArrayList<>();
-
-        for (int i = 0; i < objects.size(); i++) {
-            OCFile ocFile = FileStorageUtils.fillOCFile((RemoteFile) objects.get(i));
-            searchForLocalFileInDefaultPath(ocFile);
-
-            try {
-                ocFile = mStorageManager.saveFileWithParent(ocFile, mContext);
-
-                if (!onlyImages || MimeTypeUtil.isImage(ocFile)) {
-                    mFiles.add(ocFile);
-                }
-
-                ContentValues cv = new ContentValues();
-                cv.put(ProviderMeta.ProviderTableMeta.VIRTUAL_TYPE, type.toString());
-                cv.put(ProviderMeta.ProviderTableMeta.VIRTUAL_OCFILE_ID, ocFile.getFileId());
-
-                contentValues.add(cv);
-            } catch (RemoteOperationFailedException e) {
-                Log_OC.e(TAG, "Error saving file with parent" + e.getMessage(),e);
-            }
-        }
-
-        mStorageManager.saveVirtuals(type, contentValues);
-    }
-
-    /**
-     * Filter for getting only the folders
-     *
-     * @param files Collection of files to filter
-     * @return Folders in the input
-     */
-    public Vector<OCFile> getFolders(Vector<OCFile> files) {
-        Vector<OCFile> ret = new Vector<>();
-        OCFile current;
-        for (int i = 0; i < files.size(); i++) {
-            current = files.get(i);
-            if (current.isFolder()) {
-                ret.add(current);
-            }
-        }
-        return ret;
-    }
-
-
-    public void setSortOrder(OCFile folder, FileSortOrder sortOrder) {
-        PreferenceManager.setSortOrder(mContext, folder, sortOrder);
-        mFiles = sortOrder.sortCloudFiles(mFiles);
-        notifyDataSetChanged();
-    }
-
-
-    public ArrayList<OCFile> getCheckedItems(AbsListView parentList) {
-        SparseBooleanArray checkedPositions = parentList.getCheckedItemPositions();
-        ArrayList<OCFile> files = new ArrayList<>();
-        Object item;
-        for (int i = 0; i < checkedPositions.size(); i++) {
-            if (checkedPositions.valueAt(i)) {
-                item = getItem(checkedPositions.keyAt(i));
-                if (item != null) {
-                    files.add((OCFile) item);
-                }
-            }
-        }
-        return files;
-    }
-
-    public Vector<OCFile> getFiles() {
-        return mFiles;
-    }
-
-    public Filter getFilter() {
-        if (mFilesFilter == null) {
-            mFilesFilter = new FilesFilter();
-        }
-        return mFilesFilter;
-    }
-
-    private class FilesFilter extends Filter {
-
-        @Override
-        protected FilterResults performFiltering(CharSequence constraint) {
-            FilterResults results = new FilterResults();
-            Vector<OCFile> filteredFiles = new Vector<>();
-
-            if (!TextUtils.isEmpty(constraint)) {
-                for (int i = 0; i < mFilesAll.size(); i++) {
-                    OCFile currentFile = mFilesAll.get(i);
-                    if (currentFile.getParentRemotePath().equals(currentDirectory.getRemotePath()) &&
-                            currentFile.getFileName().toLowerCase(Locale.getDefault()).contains(
-                                    constraint.toString().toLowerCase(Locale.getDefault())) && 
-                            !filteredFiles.contains(currentFile)) {
-                        filteredFiles.add(currentFile);
-                    }
-                }
-            }
-
-            results.values = filteredFiles;
-            results.count = filteredFiles.size();
-
-            return results;
-        }
-
-        @Override
-        protected void publishResults(CharSequence constraint, Filter.FilterResults results) {
-            Vector<OCFile> ocFiles = (Vector<OCFile>) results.values;
-            mFiles.clear();
-            if (ocFiles != null && ocFiles.size() > 0) {
-                mFiles.addAll(ocFiles);
-                if (!PreferenceManager.showHiddenFilesEnabled(mContext)) {
-                    mFiles = filterHiddenFiles(mFiles);
-                }
-                FileSortOrder sortOrder = PreferenceManager.getSortOrder(mContext, null);
-                mFiles = sortOrder.sortCloudFiles(mFiles);
-            }
-
-            notifyDataSetChanged();
-            OCFileListFragmentInterface.finishedFiltering();
-
-        }
-    }
-
-
-    /**
-     * Filter for hidden files
-     *
-     * @param files Collection of files to filter
-     * @return Non-hidden files
-     */
-    public Vector<OCFile> filterHiddenFiles(Vector<OCFile> files) {
-        Vector<OCFile> ret = new Vector<>();
-        OCFile current;
-        for (int i = 0; i < files.size(); i++) {
-            current = files.get(i);
-            if (!current.isHidden() && !ret.contains(current)) {
-                ret.add(current);
-            }
-        }
-        return ret;
-    }
-
-    public void cancelAllPendingTasks() {
-        for (ThumbnailsCacheManager.ThumbnailGenerationTask task : asyncTasks) {
-            if (task != null) {
-                task.cancel(true);
-                if (task.getGetMethod() != null) {
-                    Log_OC.d(TAG, "cancel: abort get method directly");
-                    task.getGetMethod().abort();
-                }
-            }
-        }
-
-        asyncTasks.clear();
-    }
-
-}

src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java

@@ -85,7 +85,6 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     private Context mContext;
     private ArrayList<OCFile> mFiles = new ArrayList<>();
     private ArrayList<OCFile> mFilesAll = new ArrayList<>();
-    private boolean mJustFolders;
     private boolean mHideItemOptions;
     private boolean gridView = false;
     private boolean multiSelect = false;
@@ -104,12 +103,11 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
     private ArrayList<ThumbnailsCacheManager.ThumbnailGenerationTask> asyncTasks = new ArrayList<>();
 
-    public OCFileListAdapter(boolean justFolders, Context context, ComponentsGetter transferServiceGetter,
+    public OCFileListAdapter(Context context, ComponentsGetter transferServiceGetter,
                              OCFileListFragmentInterface ocFileListFragmentInterface, boolean argHideItemOptions,
                              boolean gridView) {
 
         this.ocFileListFragmentInterface = ocFileListFragmentInterface;
-        mJustFolders = justFolders;
         mContext = context;
         mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);
         mHideItemOptions = argHideItemOptions;
@@ -392,26 +390,22 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     }
 
     private String getFooterText() {
-        if (!mJustFolders) {
-            int filesCount = 0;
-            int foldersCount = 0;
-            int count = mFiles.size();
-            OCFile file;
-            for (int i = 0; i < count; i++) {
-                file = getItem(i);
-                if (file.isFolder()) {
-                    foldersCount++;
-                } else {
-                    if (!file.isHidden()) {
-                        filesCount++;
-                    }
+        int filesCount = 0;
+        int foldersCount = 0;
+        int count = mFiles.size();
+        OCFile file;
+        for (int i = 0; i < count; i++) {
+            file = getItem(i);
+            if (file.isFolder()) {
+                foldersCount++;
+            } else {
+                if (!file.isHidden()) {
+                    filesCount++;
                 }
             }
-
-            return generateFooterText(filesCount, foldersCount);
-        } else {
-            return "";
         }
+
+        return generateFooterText(filesCount, foldersCount);
     }
 
     private String generateFooterText(int filesCount, int foldersCount) {
@@ -481,9 +475,6 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         if (mStorageManager != null) {
             mFiles = mStorageManager.getFolderContent(directory, onlyOnDevice);
 
-            if (mJustFolders) {
-                mFiles = getFolders(mFiles);
-            }
             if (!PreferenceManager.showHiddenFilesEnabled(mContext)) {
                 mFiles = filterHiddenFiles(mFiles);
             }

src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java

@@ -627,6 +627,9 @@ public class UploadListAdapter extends SectionedRecyclerViewAdapter<SectionedVie
         public Comparator<OCUpload> comparator = new Comparator<OCUpload>() {
             @Override
             public int compare(OCUpload upload1, OCUpload upload2) {
+                if (upload1 == null && upload2 == null) {
+                    return 0;
+                }
                 if (upload1 == null) {
                     return -1;
                 }

src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -1195,16 +1195,14 @@ public class OCFileListFragment extends ExtendedListFragment implements OCFileLi
         }
     }
 
-
     private void updateLayout() {
-        if (!mJustFolders) {
-            // decide grid vs list view
-            if ( AccountUtils.getServerVersion(((FileActivity) mContainerActivity).getAccount())
-            .supportsRemoteThumbnails() && isGridViewPreferred(mFile)) {
-                switchToGridView();
-            } else {
-                switchToListView();
-            
+        // decide grid vs list view
+        if (AccountUtils.getServerVersion(((FileActivity) mContainerActivity).getAccount())
+                .supportsRemoteThumbnails() && isGridViewPreferred(mFile)) {
+            switchToGridView();
+        } else {
+            switchToListView();
+
         }
 
         invalidateActionMode();