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 2f1d29ef2f..6de0985902 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 @@ -604,26 +604,31 @@ else if (cursor.getCount() > 0 && cursor.moveToFirst()) { TrashBin trashBin = AppConfig.getInstance().getTrashBinInstance(); List deletedFiles = new ArrayList<>(); - if (trashBin != null) { - for (TrashBinFile trashBinFile : trashBin.listFilesInBin()) { - HybridFile hybridFile = - new HybridFile( - OpenMode.TRASH_BIN, - trashBinFile.getDeletedPath( - AppConfig.getInstance().getTrashBinInstance().getConfig()), - trashBinFile.getFileName(), - trashBinFile.isDirectory()); - if (trashBinFile.getDeleteTime() != null) { - hybridFile.setLastModified(trashBinFile.getDeleteTime() * 1000); - } - LayoutElementParcelable element = hybridFile.generateLayoutElement(context, true); - element.date = trashBinFile.getDeleteTime(); - element.longSize = trashBinFile.getSizeBytes(); - element.size = Formatter.formatFileSize(context, trashBinFile.getSizeBytes()); - element.dateModification = Utils.getDate(context, trashBinFile.getDeleteTime() * 1000); - element.isDirectory = trashBinFile.isDirectory(); - deletedFiles.add(element); + + if (trashBin == null) return deletedFiles; + + List filesInBin = trashBin.listFilesInBin(); + + if (filesInBin == null) return deletedFiles; + + for (TrashBinFile trashBinFile : filesInBin) { + HybridFile hybridFile = + new HybridFile( + OpenMode.TRASH_BIN, + trashBinFile.getDeletedPath( + AppConfig.getInstance().getTrashBinInstance().getConfig()), + trashBinFile.getFileName(), + trashBinFile.isDirectory()); + if (trashBinFile.getDeleteTime() != null) { + hybridFile.setLastModified(trashBinFile.getDeleteTime() * 1000); } + LayoutElementParcelable element = hybridFile.generateLayoutElement(context, true); + element.date = trashBinFile.getDeleteTime(); + element.longSize = trashBinFile.getSizeBytes(); + element.size = Formatter.formatFileSize(context, trashBinFile.getSizeBytes()); + element.dateModification = Utils.getDate(context, trashBinFile.getDeleteTime() * 1000); + element.isDirectory = trashBinFile.isDirectory(); + deletedFiles.add(element); } return deletedFiles; } diff --git a/app/src/main/java/com/amaze/filemanager/filesystem/HybridFile.java b/app/src/main/java/com/amaze/filemanager/filesystem/HybridFile.java index 7a900475c4..37b01b01df 100644 --- a/app/src/main/java/com/amaze/filemanager/filesystem/HybridFile.java +++ b/app/src/main/java/com/amaze/filemanager/filesystem/HybridFile.java @@ -1863,7 +1863,7 @@ public TrashBinFile toTrashBinRestoreFile(Context context) { TrashBin trashBin = AppConfig.getInstance().getTrashBinInstance(); for (TrashBinFile trashBinFile : trashBin.listFilesInBin()) { if (trashBinFile.getDeletedPath(trashBin.getConfig()).equals(path)) { - // finding path to restore to + // finding path to restore tof return new TrashBinFile( getName(context), isDirectory(context), trashBinFile.getPath(), length(context), null); }