From 5d3466b5650b6754709b46347b030b14fb253710 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 21 Feb 2018 21:49:13 +0100
Subject: [PATCH] properly show photo thumbnail at OTG files

---
 app/build.gradle                                      |  2 +-
 .../filemanager/adapters/ItemsAdapter.kt              | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index caf54370..b9afb485 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -45,7 +45,7 @@ ext {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:3.12.17'
+    implementation 'com.simplemobiletools:commons:3.12.18'
 
     implementation files('../libs/RootTools.jar')
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt
index b9d551e0..45f76164 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt
@@ -46,6 +46,7 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
     private lateinit var folderDrawable: Drawable
     private lateinit var fileDrawable: Drawable
     private var currentItemsHash = fileDirItems.hashCode()
+    private val hasOTGConnected = activity.hasOTGConnected()
 
     init {
         initDrawables()
@@ -484,7 +485,7 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
                         .error(fileDrawable)
                         .centerCrop()
 
-                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
@@ -497,7 +498,13 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
                 } else {
                     path
                 }
-                Glide.with(activity).load(itemToLoad).transition(DrawableTransitionOptions.withCrossFade()).apply(options).into(item_icon)
+
+                if (!activity.isActivityDestroyed()) {
+                    if (hasOTGConnected && itemToLoad is String && itemToLoad.startsWith(OTG_PATH)) {
+                        itemToLoad = itemToLoad.getOTGPublicPath(activity)
+                    }
+                    Glide.with(activity).load(itemToLoad).transition(DrawableTransitionOptions.withCrossFade()).apply(options).into(item_icon)
+                }
             }
         }
     }