fenix
/
Simple-Gallery
mirror of https://github.com/SimpleMobileTools/Simple-Gallery.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

catch some Room db exceptions

This commit is contained in:
tibbi 2018-06-17 22:23:26 +02:00
parent 0258fc5e29
commit 026f80aa20
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Context.kt
View File

@ -4,6 +4,7 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import android.content.res.Configuration import android.content.res.Configuration
import android.database.Cursor import android.database.Cursor
import android.database.sqlite.SQLiteException
import android.graphics.Point import android.graphics.Point
import android.media.AudioManager import android.media.AudioManager
import android.os.Build import android.os.Build
@ -276,7 +277,11 @@ fun Context.loadJpg(path: String, target: MySquareImageView, cropThumbnails: Boo
fun Context.getCachedDirectories(getVideosOnly: Boolean = false, getImagesOnly: Boolean = false, callback: (ArrayList<Directory>) -> Unit) { fun Context.getCachedDirectories(getVideosOnly: Boolean = false, getImagesOnly: Boolean = false, callback: (ArrayList<Directory>) -> Unit) {
Thread { Thread {
val directoryDao = galleryDB.DirectoryDao() val directoryDao = galleryDB.DirectoryDao()
val directories = directoryDao.getAll() as ArrayList<Directory> val directories = try {
directoryDao.getAll() as ArrayList<Directory>
} catch (e: SQLiteException) {
ArrayList<Directory>()
}
val shouldShowHidden = config.shouldShowHidden val shouldShowHidden = config.shouldShowHidden
val excludedPaths = config.excludedFolders val excludedPaths = config.excludedFolders
val includedPaths = config.includedFolders val includedPaths = config.includedFolders
@ -317,8 +322,11 @@ fun Context.getCachedMedia(path: String, getVideosOnly: Boolean = false, getImag
var media = ArrayList<Medium>() var media = ArrayList<Medium>()
val shouldShowHidden = config.shouldShowHidden val shouldShowHidden = config.shouldShowHidden
foldersToScan.forEach { foldersToScan.forEach {
val currMedia = mediumDao.getMediaFromPath(it) try {
media.addAll(currMedia) val currMedia = mediumDao.getMediaFromPath(it)
media.addAll(currMedia)
} catch (ignored: IllegalStateException) {
}
} }
if (!shouldShowHidden) { if (!shouldShowHidden) {