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

some edits to getMediaAsyncTask

Browse source
This commit is contained in:
tibbi 2017-05-20 21:06:42 +02:00
parent c0bb740c87
commit 2a7baf14d2
1 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/kotlin/com/simplemobiletools/gallery/asynctasks/GetMediaAsynctask.kt
View file

@ -6,7 +6,6 @@ import android.provider.MediaStore
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.gallery.extensions.config import com.simplemobiletools.gallery.extensions.config
import com.simplemobiletools.gallery.helpers.IMAGES import com.simplemobiletools.gallery.helpers.IMAGES
import com.simplemobiletools.gallery.helpers.IMAGES_AND_VIDEOS
import com.simplemobiletools.gallery.helpers.VIDEOS import com.simplemobiletools.gallery.helpers.VIDEOS
import com.simplemobiletools.gallery.models.Medium import com.simplemobiletools.gallery.models.Medium
import java.io.File import java.io.File
@ -15,33 +14,26 @@ import java.util.*
class GetMediaAsynctask(val context: Context, val mPath: String, val isPickVideo: Boolean = false, val isPickImage: Boolean = false, class GetMediaAsynctask(val context: Context, val mPath: String, val isPickVideo: Boolean = false, val isPickImage: Boolean = false,
val showAll: Boolean, val callback: (media: ArrayList<Medium>) -> Unit) : val showAll: Boolean, val callback: (media: ArrayList<Medium>) -> Unit) :
AsyncTask<Void, Void, Unit>() { AsyncTask<Void, Void, Unit>() {
var config = context.config
var showMedia = IMAGES_AND_VIDEOS
var fileSorting = 0
var shouldStop = false var shouldStop = false
var media = ArrayList<Medium>() var media = ArrayList<Medium>()
val showHidden = config.shouldShowHidden
override fun onPreExecute() {
super.onPreExecute()
showMedia = config.showMedia
fileSorting = config.getFileSorting(mPath)
}
override fun doInBackground(vararg params: Void): Unit { override fun doInBackground(vararg params: Void): Unit {
if (showAll) { if (showAll) {
getFilesFrom("") media = getFilesFrom("")
} else { } else {
getFilesFrom(mPath) media = getFilesFrom(mPath)
} }
Medium.sorting = fileSorting Medium.sorting = context.config.getFileSorting(mPath)
media.sort() media.sort()
return Unit return Unit
} }
private fun getFilesFrom(curPath: String) { private fun getFilesFrom(curPath: String): ArrayList<Medium> {
val curMedia = ArrayList<Medium>()
val showMedia = context.config.showMedia
val showHidden = context.config.shouldShowHidden
val projection = arrayOf(MediaStore.Images.Media._ID, val projection = arrayOf(MediaStore.Images.Media._ID,
MediaStore.Images.Media.DISPLAY_NAME, MediaStore.Images.Media.DISPLAY_NAME,
MediaStore.Images.Media.DATE_TAKEN, MediaStore.Images.Media.DATE_TAKEN,
@ -99,10 +91,11 @@ class GetMediaAsynctask(val context: Context, val mPath: String, val isPickVideo
dateModified = cur.getIntValue(MediaStore.Images.Media.DATE_MODIFIED) * 1000L dateModified = cur.getIntValue(MediaStore.Images.Media.DATE_MODIFIED) * 1000L
val medium = Medium(filename, path, isVideo, dateModified, dateTaken, size) val medium = Medium(filename, path, isVideo, dateModified, dateTaken, size)
media.add(medium) curMedia.add(medium)
} while (cur.moveToNext()) } while (cur.moveToNext())
} }
cur.close() cur.close()
return curMedia
} }
override fun onPostExecute(result: Unit?) { override fun onPostExecute(result: Unit?) {