Skip to content

Fixes NPE on HybridFile#isDirectory #3940

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
VishalNehra merged 2 commits into from
Oct 29, 2023
Merged

Fixes NPE on HybridFile#isDirectory #3940

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0200fa8
fixes #3816
VishnuSanal Sep 26, 2023
53f963a
refactor HybridFile#isDirectory
VishnuSanal Sep 26, 2023
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
Next Next commit
fixes #3816
  • Loading branch information
@VishnuSanal
VishnuSanal committed Sep 26, 2023
commit 0200fa8043f1161824f6ff8ed0d1f7356bb81b83
12 changes: 8 additions & 4 deletions app/src/main/java/com/amaze/filemanager/filesystem/HybridFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,16 +654,19 @@ public Boolean execute(@NonNull SFTPClient client) {
isDirectory = ftpFile != null && ftpFile.isDirectory();
break;
case FILE:
isDirectory = getFile().isDirectory();
File file = getFile();
isDirectory = file != null && file.isDirectory();
break;
case ROOT:
isDirectory = NativeOperations.isDirectory(path);
break;
case DOCUMENT_FILE:
isDirectory = getDocumentFile(false).isDirectory();
DocumentFile documentFile = getDocumentFile(false);
isDirectory = documentFile != null && documentFile.isDirectory();
break;
case OTG:
isDirectory = OTGUtil.getDocumentFile(path, context, false).isDirectory();
DocumentFile otgFile = OTGUtil.getDocumentFile(path, context, false);
isDirectory = otgFile != null && otgFile.isDirectory();
break;
case DROPBOX:
case BOX:
Expand All @@ -680,7 +683,8 @@ public Boolean execute(@NonNull SFTPClient client) {
.blockingGet();
break;
default:
isDirectory = getFile().isDirectory();
File f = getFile();
isDirectory = f != null && f.isDirectory();
break;
}
return isDirectory;
Expand Down