Skip to content
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

fix npes #4344

Draft
wants to merge 4 commits into
base: release/4.0
Choose a base branch
from
Draft

fix npes #4344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
360cf2d
fixes #3003
VishnuSanal Jan 1, 2025
77f5ee6
fixes #2140
VishnuSanal Jan 1, 2025
255f9f0
[#2722] use already referenced non-null variable `mainFragmentViewModel`
VishnuSanal Jan 1, 2025
8ddeae5
fixes #4227
VishnuSanal Jan 12, 2025
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
2 changes: 2 additions & 0 deletions app/src/main/java/com/amaze/filemanager/adapters/RecyclerAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,8 @@ public void toggleInverse(String path) {
notifyItemChanged(i);
}
}
invalidateSelection();
invalidateActionMode();
}

public void toggleSameTypes() {
Expand Down
18 changes: 9 additions & 9 deletions app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/LoadFilesListTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -201,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);
Expand Down Expand Up @@ -300,13 +301,12 @@ private List<LayoutElementParcelable> getCachedMediaList(
}

private void postListCustomPathProcess(
@NonNull List<LayoutElementParcelable> list, @NonNull MainFragment mainFragment) {
@NonNull List<LayoutElementParcelable> 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;
}
Expand All @@ -321,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) {
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/com/amaze/filemanager/ui/views/appbar/BottomBar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
Loading