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

fixing a crash at fetching deleted media from db

Browse source
This commit is contained in:
tibbi 2019-04-09 12:20:32 +02:00
parent 027248675c
commit 384e71aa14
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -61,7 +61,7 @@ android {
}
dependencies {
implementation 'com.simplemobiletools:commons:5.11.0'
implementation 'com.simplemobiletools:commons:5.11.3'
implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'it.sephiroth.android.exif:library:1.0.1'

9
app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt
View file

@ -1109,9 +1109,12 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
}
if (config.useRecycleBin) {
val binFolder = dirs.firstOrNull { it.path == RECYCLE_BIN }
if (binFolder != null && mMediumDao.getDeletedMedia().isEmpty()) {
invalidDirs.add(binFolder)
try {
val binFolder = dirs.firstOrNull { it.path == RECYCLE_BIN }
if (binFolder != null && mMediumDao.getDeletedMedia().isEmpty()) {
invalidDirs.add(binFolder)
}
} catch (ignored: Exception) {
}
}

2
app/src/main/res/values-zh-rCN/strings.xml
View file

@ -218,7 +218,7 @@
<string name="faq_13_text">目前显示图像的方案在绝大多数情况下都能正常工作，如果您想要更好的图像质量，您可以在设置中启用\"以最高质量显示图像\"。</string>
<string name="faq_14_title">我隐藏了某个文件/文件夹。如何取消隐藏？</string>
<string name="faq_14_text">您可以点击主界面上的\"暂时显示隐藏的项目\"选项，或在设置中开启\"显示隐藏的项目\"。 如果你想取消隐藏它，长按它并选择\"取消隐藏\"即可。 我们是通过向文件夹中添加\".nomedia\"文件来隐藏文件夹的，使用文件管理器删除该文件也可以取消隐藏。</string>
<string name="faq_15_title"为什么应用占用了这么多的空间？</string>
<string name="faq_15_title">为什么应用占用了这么多的空间？</string>
<string name="faq_15_text">应用缓存最多可达250MB，这样可以使图像加载更快。如果应用占用了更多空间，则很可能是因为回收站中有项目。这些文件被计入应用程序大小。您可以打开回收站并删除所有文件，或从应用设置中清除回收站。回收站中的内容会在30天后自动删除。</string>
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->