Skip to content

Commit 5d3466b

Browse files
committed
properly show photo thumbnail at OTG files
1 parent 0467112 commit 5d3466b

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ ext {
4545
}
4646

4747
dependencies {
48-
implementation 'com.simplemobiletools:commons:3.12.17'
48+
implementation 'com.simplemobiletools:commons:3.12.18'
4949

5050
implementation files('../libs/RootTools.jar')
5151

app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
4646
private lateinit var folderDrawable: Drawable
4747
private lateinit var fileDrawable: Drawable
4848
private var currentItemsHash = fileDirItems.hashCode()
49+
private val hasOTGConnected = activity.hasOTGConnected()
4950

5051
init {
5152
initDrawables()
@@ -484,7 +485,7 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
484485
.error(fileDrawable)
485486
.centerCrop()
486487

487-
val itemToLoad = if (fileDirItem.name.endsWith(".apk", true)) {
488+
var itemToLoad = if (fileDirItem.name.endsWith(".apk", true)) {
488489
val packageInfo = context.packageManager.getPackageArchiveInfo(path, PackageManager.GET_ACTIVITIES)
489490
if (packageInfo != null) {
490491
val appInfo = packageInfo.applicationInfo
@@ -497,7 +498,13 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
497498
} else {
498499
path
499500
}
500-
Glide.with(activity).load(itemToLoad).transition(DrawableTransitionOptions.withCrossFade()).apply(options).into(item_icon)
501+
502+
if (!activity.isActivityDestroyed()) {
503+
if (hasOTGConnected && itemToLoad is String && itemToLoad.startsWith(OTG_PATH)) {
504+
itemToLoad = itemToLoad.getOTGPublicPath(activity)
505+
}
506+
Glide.with(activity).load(itemToLoad).transition(DrawableTransitionOptions.withCrossFade()).apply(options).into(item_icon)
507+
}
501508
}
502509
}
503510
}

0 commit comments

Comments
 (0)