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

Commit 77df6a21 authored by tibbi's avatar tibbi
Browse files

improve public file uri generating

parent f150922f

build.gradle

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

        propTargetSdkVersion = propCompileSdkVersion

        propVersionCode = 1

        propVersionName = '5.2.9'

        propVersionName = '5.2.10'

        kotlin_version = '1.2.71'

    }

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

+9 −3
Original line number Diff line number Diff line
@@ -220,11 +220,17 @@ 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.isMediaFile()) {

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

    var uri = if (file.isMediaFile()) {

        getMediaContentUri(file.absolutePath)

    } else {

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

        getMediaContent(file.absolutePath, MediaStore.Files.getContentUri("external"))

    }



    if (uri == null) {

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

    }



    return uri!!

}



fun Context.getMediaContentUri(path: String): Uri? {