From 662efb32073dfcc2bd8ba4d07a0fae0450a4101b Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 22 Sep 2020 23:04:19 +0200 Subject: [PATCH] lets use the new way of checking file lastmodified on Android 11+ only --- .../gallery/pro/helpers/MediaFetcher.kt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt index 135dae0a1..80ebe8ed6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt @@ -220,7 +220,7 @@ class MediaFetcher(val context: Context) { val showHidden = config.shouldShowHidden val showPortraits = filterMedia and TYPE_PORTRAITS != 0 val dateTakens = if (getProperDateTaken && !isRecycleBin) getFolderDateTakens(folder) else HashMap() - val lastModifieds = if (getProperLastModified && !isRecycleBin) getFolderLastModifieds(folder) else HashMap() + val lastModifieds = if (getProperLastModified && !isRecycleBin && isRPlus()) getFolderLastModifieds(folder) else HashMap() val fileSizes = if (checkProperFileSize || checkFileExistence) getFolderSizes(folder) else HashMap() val files = when (folder) { @@ -302,11 +302,15 @@ class MediaFetcher(val context: Context) { } else { var lastModified = 0L if (getProperLastModified) { - var newLastModified = lastModifieds.remove(path) - if (newLastModified == null) { - newLastModified = file.lastModified() + if (isRPlus()) { + var newLastModified = lastModifieds.remove(path) + if (newLastModified == null) { + newLastModified = file.lastModified() + } + lastModified = newLastModified + } else { + lastModified = file.lastModified() } - lastModified = newLastModified } var dateTaken = lastModified