Merge pull request #9463 from nextcloud/highlightSortOrder

Correctly highlight selected sort order

src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java

@@ -364,7 +364,7 @@ public class UploadFilesActivity extends DrawerActivity implements LocalFileList
 
     @Override
     public void onSortingOrderChosen(FileSortOrder selection) {
-        preferences.setSortOrder(FileSortOrder.Type.uploadFilesView, selection);
+        preferences.setSortOrder(FileSortOrder.Type.localFileListView, selection);
         mFileListFragment.sortFiles(selection);
     }
 

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

@@ -133,8 +133,12 @@ public class LocalFileListFragment extends ExtendedListFragment implements
 
         listDirectory(mContainerActivity.getInitialDirectory());
 
-        FileSortOrder sortOrder = preferences.getSortOrderByType(FileSortOrder.Type.uploadFilesView);
-        mSortButton.setOnClickListener(v -> openSortingOrderDialogFragment(requireFragmentManager(), sortOrder));
+        mSortButton.setOnClickListener(v -> {
+            FileSortOrder sortOrder = preferences.getSortOrderByType(FileSortOrder.Type.localFileListView);
+            openSortingOrderDialogFragment(requireFragmentManager(), sortOrder);
+        });
+
+        FileSortOrder sortOrder = preferences.getSortOrderByType(FileSortOrder.Type.localFileListView);
         mSortButton.setText(DisplayUtils.getSortOrderStringId(sortOrder));
 
         setGridSwitchButton();

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

@@ -51,7 +51,7 @@ public class FileSortOrder {
     public static final Map<String, FileSortOrder> sortOrders;
 
     public enum Type {
-        trashBinView, localFileListView, uploadFilesView
+        trashBinView, localFileListView
     }
     static {
         HashMap<String, FileSortOrder> temp = new HashMap<>();