Răsfoiți Sursa

Remove FilesFilter, as it is unused

Only created in OCFileListAdapter, and then unused

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
Álvaro Brey Vilas 3 ani în urmă
părinte
comite
9e29b5cbc4

+ 0 - 55
app/src/main/java/com/owncloud/android/ui/adapter/FilesFilter.kt

@@ -1,55 +0,0 @@
-/*
- *
- * Nextcloud Android client application
- *
- * @author Tobias Kaminsky
- * Copyright (C) 2022 Tobias Kaminsky
- * Copyright (C) 2022 Nextcloud GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.owncloud.android.ui.adapter
-
-import android.text.TextUtils
-import android.widget.Filter
-import com.owncloud.android.datamodel.OCFile
-import java.util.Locale
-import java.util.Vector
-
-internal class FilesFilter(private val ocFileListAdapter: OCFileListAdapter) : Filter() {
-    override fun performFiltering(constraint: CharSequence): FilterResults {
-        val results = FilterResults()
-        val filteredFiles = Vector<OCFile>()
-        if (!TextUtils.isEmpty(constraint)) {
-            for (file in ocFileListAdapter.allFiles) {
-                if (file.parentRemotePath == ocFileListAdapter.currentDirectory.remotePath &&
-                    file.fileName.lowercase(Locale.getDefault()).contains(
-                            constraint.toString().lowercase(Locale.getDefault())
-                        ) &&
-                    !filteredFiles.contains(file)
-                ) {
-                    filteredFiles.add(file)
-                }
-            }
-        }
-        results.values = filteredFiles
-        results.count = filteredFiles.size
-        return results
-    }
-
-    override fun publishResults(constraint: CharSequence, results: FilterResults) {
-        val ocFiles = results.values as Vector<OCFile>
-        ocFileListAdapter.updateFilteredResults(ocFiles)
-    }
-}

+ 0 - 24
app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java

@@ -37,7 +37,6 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Filter;
 import android.widget.ImageView;
 
 import com.elyeproj.loaderviewlibrary.LoaderImageView;
@@ -83,7 +82,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
-import java.util.Vector;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -113,7 +111,6 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     private User user;
     private OCFileListFragmentInterface ocFileListFragmentInterface;
 
-    private FilesFilter mFilesFilter;
     private OCFile currentDirectory;
     private static final String TAG = OCFileListAdapter.class.getSimpleName();
 
@@ -818,13 +815,6 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         return mFiles;
     }
 
-    public Filter getFilter() {
-        if (mFilesFilter == null) {
-            mFilesFilter = new FilesFilter(this);
-        }
-        return mFilesFilter;
-    }
-
     public void resetLastTimestamp() {
         lastTimestamp = -1;
     }
@@ -833,20 +823,6 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         return lastTimestamp;
     }
 
-    public void updateFilteredResults(Vector<OCFile> results) {
-        mFiles.clear();
-        if (results != null && results.size() > 0) {
-            mFiles.addAll(results);
-            if (!preferences.isShowHiddenFilesEnabled()) {
-                mFiles = filterHiddenFiles(mFiles);
-            }
-            FileSortOrder sortOrder = preferences.getSortOrderByFolder(currentDirectory);
-            mFiles = sortOrder.sortCloudFiles(mFiles);
-        }
-
-        notifyDataSetChanged();
-    }
-
     @Override
     public void avatarGenerated(Drawable avatarDrawable, Object callContext) {
         ((ImageView) callContext).setImageDrawable(avatarDrawable);