From 360cf2de83fd151ac692e784cad1feda06e5428f Mon Sep 17 00:00:00 2001 From: Vishnu Sanal T Date: Wed, 1 Jan 2025 18:55:11 +0530 Subject: [PATCH 1/4] fixes #3003 --- .../java/com/amaze/filemanager/ui/views/appbar/BottomBar.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/com/amaze/filemanager/ui/views/appbar/BottomBar.java b/app/src/main/java/com/amaze/filemanager/ui/views/appbar/BottomBar.java index 4385a620e6..41e2de943c 100644 --- a/app/src/main/java/com/amaze/filemanager/ui/views/appbar/BottomBar.java +++ b/app/src/main/java/com/amaze/filemanager/ui/views/appbar/BottomBar.java @@ -197,9 +197,8 @@ public boolean onSingleTapConfirmed(MotionEvent e) { @Override public void onLongPress(MotionEvent e) { final MainFragment mainFragment = mainActivity.getCurrentMainFragment(); - Objects.requireNonNull(mainFragment); if (mainActivity.getBoolean(PREFERENCE_CHANGEPATHS) - && (mainFragment.getMainFragmentViewModel() != null + && (mainFragment != null && mainFragment.getMainFragmentViewModel() != null || buttons.getVisibility() == View.VISIBLE)) { GeneralDialogCreation.showChangePathsDialog( mainActivity, mainActivity.getPrefs()); From 77f5ee6098b78fbb021cd53501aff91f4a7fee02 Mon Sep 17 00:00:00 2001 From: Vishnu Sanal T Date: Wed, 1 Jan 2025 19:08:00 +0530 Subject: [PATCH 2/4] fixes #2140 --- .../filemanager/asynchronous/asynctasks/LoadFilesListTask.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/LoadFilesListTask.java b/app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/LoadFilesListTask.java index 6de0985902..91352fb550 100644 --- a/app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/LoadFilesListTask.java +++ b/app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/LoadFilesListTask.java @@ -130,7 +130,8 @@ public LoadFilesListTask( if (mainFragment == null || context == null || mainFragment.getMainFragmentViewModel() == null - || mainFragment.getMainActivityViewModel() == null) { + || mainFragment.getMainActivityViewModel() == null + || path == null) { cancel(true); return null; } From 255f9f041d0bbd28ef3fd25394e9ba5002790cf7 Mon Sep 17 00:00:00 2001 From: Vishnu Sanal T Date: Wed, 1 Jan 2025 19:45:14 +0530 Subject: [PATCH 3/4] [#2722] use already referenced non-null variable `mainFragmentViewModel` --- .../asynctasks/LoadFilesListTask.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/LoadFilesListTask.java b/app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/LoadFilesListTask.java index 91352fb550..ecc7cd0d65 100644 --- a/app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/LoadFilesListTask.java +++ b/app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/LoadFilesListTask.java @@ -202,7 +202,7 @@ public LoadFilesListTask( if (list != null && !(openmode == OpenMode.CUSTOM && (("5").equals(path) || ("6").equals(path) || ("7").equals(path)))) { - postListCustomPathProcess(list, mainFragment); + postListCustomPathProcess(list, mainFragmentViewModel); } return new Pair<>(openmode, list); @@ -301,13 +301,12 @@ private List getCachedMediaList( } private void postListCustomPathProcess( - @NonNull List list, @NonNull MainFragment mainFragment) { + @NonNull List list, + @NonNull MainFragmentViewModel mainFragmentViewModel) { SortType sortType = SortHandler.getSortType(context.get(), path); - MainFragmentViewModel viewModel = mainFragment.getMainFragmentViewModel(); - - if (viewModel == null) { + if (mainFragmentViewModel == null) { LOG.error("MainFragmentViewModel is null, this is a bug"); return; } @@ -322,13 +321,13 @@ private void postListCustomPathProcess( } if (layoutElementParcelable.isDirectory) { - viewModel.incrementFolderCount(); + mainFragmentViewModel.incrementFolderCount(); } else { - viewModel.incrementFileCount(); + mainFragmentViewModel.incrementFileCount(); } } - Collections.sort(list, new FileListSorter(viewModel.getDsort(), sortType)); + Collections.sort(list, new FileListSorter(mainFragmentViewModel.getDsort(), sortType)); } private @Nullable LayoutElementParcelable createListParcelables(HybridFileParcelable baseFile) { From 8ddeae5fc46b40d4382572b96d661461fb89df9c Mon Sep 17 00:00:00 2001 From: Vishnu Sanal T Date: Sun, 12 Jan 2025 10:23:03 +0530 Subject: [PATCH 4/4] fixes #4227 --- .../java/com/amaze/filemanager/adapters/RecyclerAdapter.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/com/amaze/filemanager/adapters/RecyclerAdapter.java b/app/src/main/java/com/amaze/filemanager/adapters/RecyclerAdapter.java index ace6284542..0d98940798 100644 --- a/app/src/main/java/com/amaze/filemanager/adapters/RecyclerAdapter.java +++ b/app/src/main/java/com/amaze/filemanager/adapters/RecyclerAdapter.java @@ -329,6 +329,8 @@ public void toggleInverse(String path) { notifyItemChanged(i); } } + invalidateSelection(); + invalidateActionMode(); } public void toggleSameTypes() {