fenix
/
Simple-Gallery
mirror of https://github.com/SimpleMobileTools/Simple-Gallery.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix file filtering by type

This commit is contained in:
tibbi 2018-06-18 14:29:01 +02:00
parent af0a3ac7f6
commit 64085b4e04
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -47,7 +47,7 @@ ext {
} }
dependencies { dependencies {
implementation 'com.simplemobiletools:commons:4.2.2' implementation 'com.simplemobiletools:commons:4.2.4'
implementation 'com.theartofdev.edmodo:android-image-cropper:2.7.0' implementation 'com.theartofdev.edmodo:android-image-cropper:2.7.0'
implementation 'com.android.support:multidex:1.0.3' implementation 'com.android.support:multidex:1.0.3'
implementation 'it.sephiroth.android.exif:library:1.0.1' implementation 'it.sephiroth.android.exif:library:1.0.1'

6
app/src/main/kotlin/com/simplemobiletools/gallery/helpers/MediaFetcher.kt
View File

@ -67,7 +67,7 @@ class MediaFetcher(val context: Context) {
} }
if (filterMedia and TYPE_GIFS != 0) { if (filterMedia and TYPE_GIFS != 0) {
query.append("${MediaStore.Images.Media.DATA} LIKE ?") query.append("${MediaStore.Images.Media.DATA} LIKE ? OR ")
} }
if (filterMedia and TYPE_RAWS != 0) { if (filterMedia and TYPE_RAWS != 0) {
@ -172,7 +172,7 @@ class MediaFetcher(val context: Context) {
val isImage = filename.isImageFast() val isImage = filename.isImageFast()
val isVideo = if (isImage) false else filename.isVideoFast() val isVideo = if (isImage) false else filename.isVideoFast()
val isGif = if (isImage || isVideo) false else filename.isGif() val isGif = if (isImage || isVideo) false else filename.isGif()
val isRaw = if (isImage || isVideo || isGif) false else filename.isRaw() val isRaw = if (isImage || isVideo || isGif) false else filename.isRawFast()
if (!isImage && !isVideo && !isGif && !isRaw) if (!isImage && !isVideo && !isGif && !isRaw)
continue continue
@ -231,7 +231,7 @@ class MediaFetcher(val context: Context) {
val isImage = filename.isImageFast() val isImage = filename.isImageFast()
val isVideo = if (isImage) false else filename.isVideoFast() val isVideo = if (isImage) false else filename.isVideoFast()
val isGif = if (isImage || isVideo) false else filename.isGif() val isGif = if (isImage || isVideo) false else filename.isGif()
val isRaw = if (isImage || isVideo || isGif) false else filename.isRaw() val isRaw = if (isImage || isVideo || isGif) false else filename.isRawFast()
if (!isImage && !isVideo && !isGif || !isRaw) if (!isImage && !isVideo && !isGif || !isRaw)
continue continue