Merge pull request #15678 from nextcloud/backport/15584/stable-3.34

[stable-3.34] Preview: obey sort order when favorites

Author: tobiasKaminsky

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

@@ -996,7 +996,11 @@ public void setData(List<Object> objects,
             searchType == SearchType.RECENTLY_MODIFIED_SEARCH) {
             mFiles = FileStorageUtils.sortOcFolderDescDateModifiedWithoutFavoritesFirst(mFiles);
         } else if (searchType != SearchType.SHARED_FILTER) {
-            sortOrder = preferences.getSortOrderByFolder(folder);
+            if (searchType == SearchType.FAVORITE_SEARCH) {
+                sortOrder = preferences.getSortOrderByType(FileSortOrder.Type.favoritesListView);
+            } else {
+                sortOrder = preferences.getSortOrderByFolder(folder);
+            }
             mFiles = sortOrder.sortCloudFiles(mFiles);
         }
 
@@ -1128,7 +1132,12 @@ private void parseVirtuals(List<Object> objects, SearchType searchType) {
     }
 
     public void setSortOrder(@Nullable OCFile folder, FileSortOrder sortOrder) {
-        preferences.setSortOrder(folder, sortOrder);
+        if (searchType == SearchType.FAVORITE_SEARCH) {
+            preferences.setSortOrder(FileSortOrder.Type.favoritesListView, sortOrder);    
+        } else {
+            preferences.setSortOrder(folder, sortOrder);
+        }
+        
         mFiles = sortOrder.sortCloudFiles(mFiles);
         notifyDataSetChanged();
 

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

@@ -1632,9 +1632,7 @@ private void updateLayout() {
             switchToListView();
         }
 
-        if (mSortButton != null) {
-            mSortButton.setText(DisplayUtils.getSortOrderStringId(preferences.getSortOrderByFolder(mFile)));
-        }
+        updateSortButton();
         if (mSwitchGridViewButton != null) {
             setGridSwitchButton();
         }
@@ -1645,6 +1643,19 @@ private void updateLayout() {
 
         invalidateActionMode();
     }
+    
+    private void updateSortButton() {
+        if (mSortButton != null) {
+            FileSortOrder sortOrder;
+            if (currentSearchType == FAVORITE_SEARCH) {
+                sortOrder = preferences.getSortOrderByType(FileSortOrder.Type.favoritesListView, FileSortOrder.SORT_A_TO_Z);
+            } else {
+                sortOrder = preferences.getSortOrderByFolder(mFile);
+            }
+
+            mSortButton.setText(DisplayUtils.getSortOrderStringId(sortOrder));
+        }
+    }
 
     private void invalidateActionMode() {
         if (mActiveActionMode != null) {
@@ -1925,6 +1936,8 @@ protected void handleSearchEvent(SearchEvent event) {
             }
         };
 
+        updateSortButton();
+
         new Handler(Looper.getMainLooper()).post(switchViewsRunnable);
 
         final User currentUser = accountManager.getUser();

app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt

@@ -169,7 +169,8 @@ class PreviewImageActivity :
                 this,
                 type,
                 user,
-                storageManager
+                storageManager,
+                preferences
             )
         } else {
             // get parent from path

app/src/main/java/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.kt

@@ -20,6 +20,7 @@ import com.owncloud.android.datamodel.FileDataStorageManager
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.datamodel.VirtualFolderType
 import com.owncloud.android.ui.fragment.FileFragment
+import com.owncloud.android.utils.FileSortOrder
 import com.owncloud.android.utils.FileStorageUtils
 
 /**
@@ -82,7 +83,8 @@ class PreviewImagePagerAdapter : FragmentStateAdapter {
         fragmentActivity: FragmentActivity,
         type: VirtualFolderType?,
         user: User,
-        storageManager: FileDataStorageManager
+        storageManager: FileDataStorageManager,
+        preferences: AppPreferences
     ) : super(fragmentActivity) {
         requireNotNull(type) { "NULL parent folder" }
         require(type != VirtualFolderType.NONE) { "NONE virtual folder type" }
@@ -97,6 +99,11 @@ class PreviewImagePagerAdapter : FragmentStateAdapter {
             imageFiles = mStorageManager.getVirtualFolderContent(type, true)
         }
 
+        if (type == VirtualFolderType.FAVORITE) {
+            val sortOrder = preferences.getSortOrderByType(FileSortOrder.Type.favoritesListView)
+            imageFiles = sortOrder.sortCloudFiles(imageFiles.toMutableList()).toMutableList()
+        }
+
         mObsoleteFragments = HashSet()
         mObsoletePositions = HashSet()
         mDownloadErrors = HashSet()

app/src/main/java/com/owncloud/android/utils/FileSortOrder.kt

@@ -25,7 +25,9 @@ open class FileSortOrder(@JvmField var name: String, var isAscending: Boolean) {
         trashBinView,
 
         @Suppress("ktlint:standard:enum-entry-name-case")
-        localFileListView
+        localFileListView,
+
+        favoritesListView
     }
 
     enum class SortType {