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

Merge pull request #2955 from gmasil/close-closables-to-prevent-leaks

Browse source 
close inputstream and datasource to prevent leaks
This commit is contained in:
Tibor Kaputa 2023-08-30 13:57:06 +02:00 committed by GitHub
commit 4951002796
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt
View file

@ -744,18 +744,18 @@ class PhotoFragment : ViewPagerFragment() {
} }
private fun checkIfPanorama() { private fun checkIfPanorama() {
mIsPanorama = try { mIsPanorama = try {
val inputStream = if (mMedium.path.startsWith("content:/")) { if (mMedium.path.startsWith("content:/")) {
requireContext().contentResolver.openInputStream(Uri.parse(mMedium.path)) requireContext().contentResolver.openInputStream(Uri.parse(mMedium.path))
} else { } else {
File(mMedium.path).inputStream() File(mMedium.path).inputStream()
}.use {
val imageParser = JpegImageParser().getXmpXml(ByteSourceInputStream(it, mMedium.name), HashMap<String, Any>())
imageParser.contains("GPano:UsePanoramaViewer=\"True\"", true) ||
imageParser.contains("<GPano:UsePanoramaViewer>True</GPano:UsePanoramaViewer>", true) ||
imageParser.contains("GPano:FullPanoWidthPixels=") ||
imageParser.contains("GPano:ProjectionType>Equirectangular")
} }
val imageParser = JpegImageParser().getXmpXml(ByteSourceInputStream(inputStream, mMedium.name), HashMap<String, Any>())
imageParser.contains("GPano:UsePanoramaViewer=\"True\"", true) ||
imageParser.contains("<GPano:UsePanoramaViewer>True</GPano:UsePanoramaViewer>", true) ||
imageParser.contains("GPano:FullPanoWidthPixels=") ||
imageParser.contains("GPano:ProjectionType>Equirectangular")
} catch (e: Exception) { } catch (e: Exception) {
false false
} catch (e: OutOfMemoryError) { } catch (e: OutOfMemoryError) {

3
app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/VideoFragment.kt
View file

@ -364,6 +364,7 @@ class VideoFragment : ViewPagerFragment(), TextureView.SurfaceTextureListener, S
try { try {
fileDataSource.open(dataSpec) fileDataSource.open(dataSpec)
} catch (e: Exception) { } catch (e: Exception) {
fileDataSource.close()
activity?.showErrorToast(e) activity?.showErrorToast(e)
return return
} }
@ -372,6 +373,8 @@ class VideoFragment : ViewPagerFragment(), TextureView.SurfaceTextureListener, S
val mediaSource: MediaSource = ProgressiveMediaSource.Factory(factory) val mediaSource: MediaSource = ProgressiveMediaSource.Factory(factory)
.createMediaSource(MediaItem.fromUri(fileDataSource.uri!!)) .createMediaSource(MediaItem.fromUri(fileDataSource.uri!!))
fileDataSource.close()
mPlayOnPrepared = true mPlayOnPrepared = true
mExoPlayer = ExoPlayer.Builder(requireContext()) mExoPlayer = ExoPlayer.Builder(requireContext())