Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b7ae048 authored by tibbi's avatar tibbi
Browse files

adding a helper function for recognizing svg files

parent 77fb27ee

build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ buildscript { 
        propMinSdkVersion = 16

        propTargetSdkVersion = propCompileSdkVersion

        propVersionCode = 1

        propVersionName = '4.6.11'

        propVersionName = '4.6.12'

        kotlin_version = '1.2.60'

        support_libs = '27.1.1'

    }

commons/src/main/kotlin/com/simplemobiletools/commons/asynctasks/CopyMoveTask.kt

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ class CopyMoveTask(val activity: BaseSimpleActivity, val copyOnly: Boolean = fal 
    }



    private fun copyFile(source: FileDirItem, destination: FileDirItem) {

        if (copyMediaOnly && !source.path.isImageVideoGif()) {

        if (copyMediaOnly && !source.path.isMediaFile()) {

            mCurrentProgress += source.size

            return

        }

commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt

+1 −1
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ fun BaseSimpleActivity.deleteFolderBg(fileDirItem: FileDirItem, deleteMediaOnly: 
            return

        }



        val files = filesArr.toMutableList().filter { !deleteMediaOnly || it.isImageVideoGif() }

        val files = filesArr.toMutableList().filter { !deleteMediaOnly || it.isMediaFile() }

        for (file in files) {

            deleteFileBg(file.toFileDirItem(applicationContext), false) { }

        }

commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context.kt

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ fun Context.getPermissionString(id: Int) = when (id) { 
fun Context.getFilePublicUri(file: File, applicationId: String): Uri {

    // for images/videos/gifs try getting a media content uri first, like content://media/external/images/media/438

    // if media content uri is null, get our custom uri like content://com.simplemobiletools.gallery.provider/external_files/emulated/0/DCIM/IMG_20171104_233915.jpg

    return if (file.isImageVideoGif()) {

    return if (file.isMediaFile()) {

        getMediaContentUri(file.absolutePath) ?: FileProvider.getUriForFile(this, "$applicationId.provider", file)

    } else {

        FileProvider.getUriForFile(this, "$applicationId.provider", file)

commons/src/main/kotlin/com/simplemobiletools/commons/extensions/File.kt

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ import com.simplemobiletools.commons.helpers.videoExtensions 
import com.simplemobiletools.commons.models.FileDirItem

import java.io.File



fun File.isImageVideoGif() = absolutePath.isImageFast() || absolutePath.isVideoFast() || absolutePath.isGif() || absolutePath.isRawFast()

fun File.isMediaFile() = absolutePath.isImageFast() || absolutePath.isVideoFast() || absolutePath.isGif() || absolutePath.isRawFast() || absolutePath.isSvg()

fun File.isGif() = absolutePath.endsWith(".gif", true)

fun File.isVideoFast() = videoExtensions.any { absolutePath.endsWith(it, true) }

fun File.isImageFast() = photoExtensions.any { absolutePath.endsWith(it, true) }