Skip to content

Commit 612824f

Browse files
Merge pull request #16599 from nextcloud/fix/oc-file-list-fragment-on-destroy-action-mode-npe
fix(oc-file-list-fragment): npe on destroy action mode
2 parents f780f5b + cfd9fc6 commit 612824f

1 file changed

Lines changed: 11 additions & 4 deletions

File tree

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -896,16 +896,23 @@ public void onDestroyActionMode(ActionMode mode) {
896896

897897
// show FAB on multi selection mode exit
898898
if (!mHideFab && !searchFragment) {
899-
setFabVisible(mFile.canCreateFileAndFolder());
899+
final var file = mFile;
900+
if (file != null) {
901+
setFabVisible(file.canCreateFileAndFolder());
902+
}
900903
}
901904

902-
Activity activity = getActivity();
905+
final var activity = getActivity();
903906
if (activity != null) {
904907
viewThemeUtils.platform.resetStatusBar(activity);
905908
}
906909

907-
getCommonAdapter().setMultiSelect(false);
908-
getCommonAdapter().clearCheckedItems();
910+
final var adapter = getCommonAdapter();
911+
if (adapter != null) {
912+
adapter.setMultiSelect(false);
913+
adapter.clearCheckedItems();
914+
}
915+
909916
isMultipleFileSelectedForCopyOrMove = false;
910917
}
911918

0 commit comments

Comments
 (0)