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

Commit cb7475a1 authored by tibbi's avatar tibbi
Browse files

properly display OTG image preview

parent b7f8c2a9

build.gradle

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

        propTargetSdkVersion = propCompileSdkVersion

        propVersionCode = 1

        propVersionName = '3.12.11'

        propVersionName = '3.12.12'

        kotlin_version = '1.2.21'

        support_libs = '27.0.2'

    }

commons/src/main/kotlin/com/simplemobiletools/commons/adapters/FilepickerItemsAdapter.kt

+6 −4
Original line number Diff line number Diff line
@@ -9,9 +9,7 @@ import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withC 
import com.bumptech.glide.request.RequestOptions

import com.simplemobiletools.commons.R

import com.simplemobiletools.commons.activities.BaseSimpleActivity

import com.simplemobiletools.commons.extensions.formatSize

import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor

import com.simplemobiletools.commons.extensions.isActivityDestroyed

import com.simplemobiletools.commons.extensions.*

import com.simplemobiletools.commons.models.FileDirItem

import com.simplemobiletools.commons.views.MyRecyclerView

import kotlinx.android.synthetic.main.filepicker_list_item.view.*
@@ -21,6 +19,7 @@ class FilepickerItemsAdapter(activity: BaseSimpleActivity, val fileDirItems: Lis 


    private val folderDrawable = activity.resources.getColoredDrawableWithColor(R.drawable.ic_folder, textColor)

    private val fileDrawable = activity.resources.getColoredDrawableWithColor(R.drawable.ic_file, textColor)

    private val hasOTGConnected = activity.hasOTGConnected()



    init {

        folderDrawable.alpha = 180
@@ -74,7 +73,7 @@ class FilepickerItemsAdapter(activity: BaseSimpleActivity, val fileDirItems: Lis 
                        .centerCrop()

                        .error(fileDrawable)



                val itemToLoad = if (fileDirItem.name.endsWith(".apk", true)) {

                var itemToLoad = if (fileDirItem.name.endsWith(".apk", true)) {

                    val packageInfo = context.packageManager.getPackageArchiveInfo(path, PackageManager.GET_ACTIVITIES)

                    if (packageInfo != null) {

                        val appInfo = packageInfo.applicationInfo
@@ -89,6 +88,9 @@ class FilepickerItemsAdapter(activity: BaseSimpleActivity, val fileDirItems: Lis 
                }



                if (!activity.isActivityDestroyed()) {

                    if (hasOTGConnected && itemToLoad is String && activity.isPathOnOTG(itemToLoad)) {

                        itemToLoad = itemToLoad.getOTGPublicPath(activity)

                    }

                    Glide.with(activity).load(itemToLoad).transition(withCrossFade()).apply(options).into(list_item_icon)

                }

            }

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

+2 −0
Original line number Diff line number Diff line
@@ -215,6 +215,8 @@ fun String.getImageResolution(): Point? { 


fun String.getPublicUri(context: Context) = context.getDocumentFile(this)?.uri ?: ""



fun String.getOTGPublicPath(context: Context) = "${context.baseConfig.OTGBasePath}%3A${substring(OTG_PATH.length).replace("/", "%2F")}"



fun String.getMimeType(): String {

    val typesMap = HashMap<String, String>().apply {

        put("323", "text/h323")