faster filtering

Signed-off-by: alperozturk <[email protected]>

Author: alperozturk96

app/src/main/java/com/nextcloud/utils/extensions/OCFileExtensions.kt

@@ -37,21 +37,8 @@ fun List<OCFile>.hasSameContentAs(other: List<OCFile>): Boolean {
 
 fun List<OCFile>.filterFilenames(): List<OCFile> = distinctBy { it.fileName }
 
-fun List<OCFile>.filterTempFilter(): List<OCFile> = filterNot { it.isTempFile() }
-
 fun OCFile.isTempFile(): Boolean {
     val context = MainApp.getAppContext()
     val appTempPath = FileStorageUtils.getAppTempDirectoryPath(context)
     return storagePath?.startsWith(appTempPath) == true
 }
-
-fun List<OCFile>.filterHiddenFiles(): List<OCFile> = filterNot { it.isHidden }.distinct()
-
-fun List<OCFile>.filterByMimeType(mimeType: String): List<OCFile> =
-    filter { it.isFolder || it.mimeType.startsWith(mimeType) }
-
-fun List<OCFile>.limitToPersonalFiles(userId: String): List<OCFile> = filter { file ->
-    file.ownerId?.let { ownerId ->
-        ownerId == userId && !file.isSharedWithMe && !file.mounted()
-    } == true
-}

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

@@ -59,6 +59,7 @@
 import com.owncloud.android.ui.activity.ComponentsGetter;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.adapter.helper.OCFileListAdapterHelper;
+import com.owncloud.android.ui.fragment.EmptyListState;
 import com.owncloud.android.ui.fragment.OCFileListFragment;
 import com.owncloud.android.ui.fragment.SearchType;
 import com.owncloud.android.ui.interfaces.OCFileListFragmentInterface;
@@ -859,7 +860,7 @@ public void swapDirectory(
             return;
         }
 
-        ocFileListFragmentInterface.setLoadingEmptyListState();
+        ocFileListFragmentInterface.setNewEmptyListState(EmptyListState.LOADING);
 
         helper.prepareFileList(directory,
                                updatedStorageManager,
@@ -895,6 +896,10 @@ public void updateAdapter(List<OCFile> newFiles, OCFile directory) {
         searchType = null;
 
         activity.runOnUiThread(this::notifyDataSetChanged);
+
+        if (mFiles.isEmpty()) {
+            ocFileListFragmentInterface.setNewEmptyListState(SearchType.NO_SEARCH);
+        }
     }
 
     public void prepareForSearchData(FileDataStorageManager storageManager, SearchType searchType) {

app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterHelper.kt

@@ -9,11 +9,8 @@ package com.owncloud.android.ui.adapter.helper
 
 import com.nextcloud.client.database.entity.FileEntity
 import com.nextcloud.client.preferences.AppPreferences
-import com.nextcloud.utils.extensions.filterByMimeType
 import com.nextcloud.utils.extensions.filterFilenames
-import com.nextcloud.utils.extensions.filterHiddenFiles
-import com.nextcloud.utils.extensions.filterTempFilter
-import com.nextcloud.utils.extensions.limitToPersonalFiles
+import com.nextcloud.utils.extensions.isTempFile
 import com.owncloud.android.MainApp
 import com.owncloud.android.R
 import com.owncloud.android.datamodel.FileDataStorageManager
@@ -27,6 +24,7 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import java.util.ArrayList
 
 class OCFileListAdapterHelper {
     private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
@@ -43,36 +41,56 @@ class OCFileListAdapterHelper {
         onComplete: (List<OCFile>, FileSortOrder) -> Unit
     ) {
         job = scope.launch {
-            var result = getFolderContent(directory, storageManager, onlyOnDevice)
+            val showHiddenFiles = preferences.isShowHiddenFilesEnabled()
+            val hasMimeTypeFilter = limitToMimeType.isNotEmpty()
+            val isRootAndPersonalOnly = (OCFile.ROOT_PATH == directory.remotePath && MainApp.isOnlyPersonFiles())
+            val isSharedView = (DrawerActivity.menuItemId == R.id.nav_shared)
+            val isFavoritesView = (DrawerActivity.menuItemId == R.id.nav_favorites)
+
+            val rawResult = getFolderContent(directory, storageManager, onlyOnDevice)
+            val filtered = ArrayList<OCFile>(rawResult.size)
+
+            for (file in rawResult) {
+                if (!showHiddenFiles && file.isHidden) {
+                    continue
+                }
 
-            if (!preferences.isShowHiddenFilesEnabled()) {
-                result = result.filterHiddenFiles()
-            }
+                if (hasMimeTypeFilter && !(file.isFolder || file.mimeType.startsWith(limitToMimeType))) {
+                    continue
+                }
 
-            if (!limitToMimeType.isEmpty()) {
-                result = result.filterByMimeType(limitToMimeType)
-            }
+                if (isRootAndPersonalOnly) {
+                    val isPersonal = file.ownerId?.let { ownerId ->
+                        ownerId == userId && !file.isSharedWithMe && !file.mounted()
+                    } == true
 
-            if (OCFile.ROOT_PATH == directory.remotePath && MainApp.isOnlyPersonFiles()) {
-                result = result.limitToPersonalFiles(userId)
-            }
+                    if (!isPersonal) {
+                        continue
+                    }
+                }
 
-            if (DrawerActivity.menuItemId == R.id.nav_shared) {
-                result = result.filter { it.isShared }
-            }
+                if (isSharedView && !file.isShared) {
+                    continue
+                }
+
+                if (isFavoritesView && !file.isFavorite) {
+                    continue
+                }
+
+                if (file.isTempFile()) {
+                    continue
+                }
 
-            if (DrawerActivity.menuItemId == R.id.nav_favorites) {
-                result = result.filter { it.isFavorite }
+                filtered.add(file)
             }
 
-            result = result.filterTempFilter()
-            result = result.filterFilenames()
-            result = mergeOCFilesForLivePhoto(result)
-            result = addOfflineOperations(result, directory.fileId, storageManager)
-            val (newList, newSortOrder) = sortData(directory, result, preferences)
+            val afterFilenameFilter = filtered.filterFilenames()
+            val merged = mergeOCFilesForLivePhoto(afterFilenameFilter)
+            val finalList = addOfflineOperations(merged, directory.fileId, storageManager)
+            val (sortedList, sortOrder) = sortData(directory, finalList, preferences)
 
             withContext(Dispatchers.Main) {
-                onComplete(newList, newSortOrder)
+                onComplete(sortedList, sortOrder)
             }
         }
     }

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

@@ -22,6 +22,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.os.Parcelable;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Pair;
@@ -718,8 +719,8 @@ public void onHeaderClicked() {
     }
 
     @Override
-    public void setLoadingEmptyListState() {
-        setEmptyListMessage(EmptyListState.LOADING);
+    public void setNewEmptyListState(Parcelable emptyListState) {
+        setEmptyListMessage(emptyListState);
     }
 
     @Override

app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt

@@ -199,7 +199,8 @@ class OCFileListSearchTask(
     }
 
     @Suppress("DEPRECATION")
-    private suspend fun parseAndSaveVirtuals(data: List<Any>, fragment: OCFileListFragment) = withContext(Dispatchers.IO) {
+    private suspend fun parseAndSaveVirtuals(data: List<Any>, fragment: OCFileListFragment) =
+        withContext(Dispatchers.IO) {
             val fileDataStorageManager = fileDataStorageManager ?: return@withContext
             val activity = fragment.activity ?: return@withContext
             val now = System.currentTimeMillis()

app/src/main/java/com/owncloud/android/ui/interfaces/OCFileListFragmentInterface.java

@@ -7,6 +7,7 @@
  */
 package com.owncloud.android.ui.interfaces;
 
+import android.os.Parcelable;
 import android.view.View;
 
 import com.owncloud.android.datamodel.OCFile;
@@ -36,5 +37,5 @@ public interface OCFileListFragmentInterface {
 
     void onHeaderClicked();
 
-    void setLoadingEmptyListState();
+    void setNewEmptyListState(Parcelable state);
 }