Mirrors/FossifyGallery
2
0
Fork 1
mirror of https://github.com/FossifyOrg/Gallery.git synced 2024-11-26 22:47:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

adding 2 more null checks

Browse source
This commit is contained in:
tibbi 2019-11-27 22:28:38 +01:00
parent 1d0f129e85
commit a1b390190e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt
View file

@ -1114,7 +1114,7 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
} else if (it.path != config.tempFolderPath) { } else if (it.path != config.tempFolderPath) {
val children = if (isPathOnOTG(it.path)) getOTGFolderChildrenNames(it.path) else File(it.path).list()?.asList() val children = if (isPathOnOTG(it.path)) getOTGFolderChildrenNames(it.path) else File(it.path).list()?.asList()
val hasMediaFile = children?.any { val hasMediaFile = children?.any {
it?.isMediaFile() == true || (File(it).isDirectory && it?.startsWith("img_", true) == true) it?.isMediaFile() == true || (File(it!!).isDirectory && it.startsWith("img_", true))
} ?: false } ?: false
if (!hasMediaFile) { if (!hasMediaFile) {

2
app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt
View file

@ -251,7 +251,7 @@ fun Context.getDirectParentSubfolders(dirs: ArrayList<Directory>, currentPathPre
// /storage/emulated/0/Pictures/Screenshots, // /storage/emulated/0/Pictures/Screenshots,
// but /storage/emulated/0/Pictures is empty, still Pictures with the first folders thumbnails and proper other info // but /storage/emulated/0/Pictures is empty, still Pictures with the first folders thumbnails and proper other info
val parent = File(path).parent val parent = File(path).parent
if (!folders.contains(parent) && dirs.none { it.path == parent }) { if (parent != null && !folders.contains(parent) && dirs.none { it.path == parent }) {
currentPaths.add(parent) currentPaths.add(parent)
val isSortingAscending = config.sorting and SORT_DESCENDING == 0 val isSortingAscending = config.sorting and SORT_DESCENDING == 0
val subDirs = dirs.filter { File(it.path).parent.equals(File(path).parent, true) } as ArrayList<Directory> val subDirs = dirs.filter { File(it.path).parent.equals(File(path).parent, true) } as ArrayList<Directory>