Skip to content

fix(gallery-fragment): illegal state exception #16812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alperozturk96 merged 1 commit into from
Apr 8, 2026
Merged

fix(gallery-fragment): illegal state exception #16812

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ public class GalleryFragment extends OCFileListFragment implements GalleryFragme
private static final int SELECT_LOCATION_REQUEST_CODE = 212;
private GalleryFragmentBottomSheetDialog galleryFragmentBottomSheetDialog;

@Inject FileDataStorageManager fileDataStorageManager;
private final static int maxColumnSizeLandscape = 5;
private final static int maxColumnSizePortrait = 2;
private int columnSize;
Expand Down Expand Up @@ -119,9 +118,17 @@ public static void setLastMediaItemPosition(Integer position) {

@Override
public void onDestroyView() {
if (photoSearchTask != null) {
photoSearchTask.cancel(true);
photoSearchTask = null;
}

LocalBroadcastManager.getInstance(requireContext()).unregisterReceiver(refreshSearchEventReceiver);

setLastMediaItemPosition(null);

mAdapter.cleanup();

super.onDestroyView();
}

Expand Down Expand Up @@ -264,6 +271,8 @@ private void searchAndDisplay() {
}

public void searchCompleted(boolean emptySearch, long lastTimeStamp) {
if (!isAdded()) return;

this.setPhotoSearchQueryRunning(false);

if (lastTimeStamp > -1) {
Expand Down Expand Up @@ -407,7 +416,12 @@ public void showAllGalleryItems() {
}

private void updateSubtitle(GalleryFragmentBottomSheetDialog.MediaState mediaState) {
requireActivity().runOnUiThread(() -> {
final var activity = getActivity();
if (!isAdded() || activity == null) {
return;
}

activity.runOnUiThread(() -> {
if (!isAdded()) {
return;
}
Expand All @@ -419,7 +433,7 @@ private void updateSubtitle(GalleryFragmentBottomSheetDialog.MediaState mediaSta
subTitle = getResources().getString(R.string.subtitle_videos_only);
}

if (requireActivity() instanceof ToolbarActivity toolbarActivity) {
if (activity instanceof ToolbarActivity toolbarActivity) {
toolbarActivity.updateToolbarSubtitle(subTitle);
}
});
Expand Down
Loading