Mirrors/FossifyGallery
2
0
Fork 1
mirror of https://github.com/FossifyOrg/Gallery.git synced 2024-11-30 00:17:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix #2332, try showing an image asap at third party intents

Browse source
This commit is contained in:
tibbi 2022-02-14 11:08:49 +01:00
parent 080e7e983d
commit 318664fca1
1 changed files with 40 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt
View file

@ -129,6 +129,24 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
window.attributes = attributes window.attributes = attributes
} }
// show the selected image asap, while loading the rest in the background to allow swiping between them. Needed at third party intents
if (mMediaFiles.isEmpty() && mPath.isNotEmpty()) {
getCachedMedia(mPath.getParentPath(), false, false) { thumbnailItems ->
// if we have nothing cached from the given folder, at least show the selected image asap
if (thumbnailItems.isEmpty()) {
val filename = mPath.getFilenameFromPath()
val folder = mPath.getParentPath()
val type = getTypeFromPath(mPath)
val medium = Medium(null, filename, mPath, folder, 0, 0, 0, type, 0, false, 0L, 0L)
thumbnailItems.add(medium)
}
runOnUiThread {
gotMedia(thumbnailItems)
}
}
}
setupOrientation() setupOrientation()
invalidateOptionsMenu() invalidateOptionsMenu()
@ -393,26 +411,30 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
if (intent.action == "com.android.camera.action.REVIEW") { if (intent.action == "com.android.camera.action.REVIEW") {
ensureBackgroundThread { ensureBackgroundThread {
if (mediaDB.getMediaFromPath(mPath).isEmpty()) { if (mediaDB.getMediaFromPath(mPath).isEmpty()) {
val type = when { val filename = mPath.getFilenameFromPath()
mPath.isVideoFast() -> TYPE_VIDEOS val parent = mPath.getParentPath()
mPath.isGif() -> TYPE_GIFS val type = getTypeFromPath(mPath)
mPath.isSvg() -> TYPE_SVGS
mPath.isRawFast() -> TYPE_RAWS
mPath.isPortrait() -> TYPE_PORTRAITS
else -> TYPE_IMAGES
}
val isFavorite = favoritesDB.isFavorite(mPath) val isFavorite = favoritesDB.isFavorite(mPath)
val duration = if (type == TYPE_VIDEOS) getDuration(mPath) ?: 0 else 0 val duration = if (type == TYPE_VIDEOS) getDuration(mPath) ?: 0 else 0
val ts = System.currentTimeMillis() val ts = System.currentTimeMillis()
val medium = val medium = Medium(null, filename, mPath, parent, ts, ts, File(mPath).length(), type, duration, isFavorite, 0, 0L)
Medium(null, mPath.getFilenameFromPath(), mPath, mPath.getParentPath(), ts, ts, File(mPath).length(), type, duration, isFavorite, 0, 0L)
mediaDB.insert(medium) mediaDB.insert(medium)
} }
} }
} }
} }
private fun getTypeFromPath(path: String): Int {
return when {
path.isVideoFast() -> TYPE_VIDEOS
path.isGif() -> TYPE_GIFS
path.isSvg() -> TYPE_SVGS
path.isRawFast() -> TYPE_RAWS
path.isPortrait() -> TYPE_PORTRAITS
else -> TYPE_IMAGES
}
}
private fun initBottomActions() { private fun initBottomActions() {
initBottomActionButtons() initBottomActionButtons()
initBottomActionsLayout() initBottomActionsLayout()
@ -652,6 +674,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
path = it path = it
getCurrentMedia()[mPos] = this getCurrentMedia()[mPos] = this
} }
invalidateOptionsMenu() invalidateOptionsMenu()
callback?.invoke() callback?.invoke()
} }
@ -1154,8 +1177,10 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
} }
private fun gotMedia(thumbnailItems: ArrayList<ThumbnailItem>, ignorePlayingVideos: Boolean = false) { private fun gotMedia(thumbnailItems: ArrayList<ThumbnailItem>, ignorePlayingVideos: Boolean = false) {
val media = val media = thumbnailItems.asSequence().filter {
thumbnailItems.asSequence().filter { it is Medium && !mIgnoredPaths.contains(it.path) }.map { it as Medium }.toMutableList() as ArrayList<Medium> it is Medium && !mIgnoredPaths.contains(it.path)
}.map { it as Medium }.toMutableList() as ArrayList<Medium>
if (isDirEmpty(media) || media.hashCode() == mPrevHashcode) { if (isDirEmpty(media) || media.hashCode() == mPrevHashcode) {
return return
} }
@ -1166,9 +1191,8 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
mPrevHashcode = media.hashCode() mPrevHashcode = media.hashCode()
mMediaFiles = media mMediaFiles = media
mPos = if (mPos == -1) { mPos = getPositionInList(media)
getPositionInList(media) if (mPos == -1) {
} else {
Math.min(mPos, mMediaFiles.size - 1) Math.min(mPos, mMediaFiles.size - 1)
} }