Merge pull request #12540 from nextcloud/bugfix/pop-sort-list-crash

BugFix Check emptiness of previousSortGroupState
nextcloud · Feb 14, 2024 · dac1b46 · dac1b46
2 parents 4f22097 + 480ad5f
commit dac1b46
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -2486,7 +2486,12 @@ private void setSortListGroup(boolean currentListGroupVisibility, boolean show)
      * visibility earlier using {@link #setSortListGroup(boolean, boolean)}
      */
     private void popSortListGroupVisibility() {
-        boolean popped = previousSortGroupState.pop();
-        showSortListGroup(popped);
+        showSortListGroup(false);
+
+        if (previousSortGroupState.isEmpty()) {
+            return;
+        }
+
+        previousSortGroupState.pop();
     }
 }
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
@@ -74,6 +74,7 @@
 import com.owncloud.android.operations.RefreshFolderOperation;
 import com.owncloud.android.operations.RemoteOperationFailedException;
 import com.owncloud.android.ui.activity.ComponentsGetter;
+import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.fragment.SearchType;
 import com.owncloud.android.ui.interfaces.OCFileListFragmentInterface;
 import com.owncloud.android.ui.preview.PreviewTextFragment;
@@ -160,6 +161,10 @@ public OCFileListAdapter(
         this.gridView = gridView;
         mStorageManager = transferServiceGetter.getStorageManager();
 
+        if (activity instanceof FileDisplayActivity) {
+            ((FileDisplayActivity) activity).showSortListGroup(true);
+        }
+
         if (mStorageManager == null) {
             mStorageManager = new FileDataStorageManager(user, activity.getContentResolver());
         }