From 384e71aa141c78a2fd34c01bbf65ca158117e8b4 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 9 Apr 2019 12:20:32 +0200
Subject: [PATCH] fixing a crash at fetching deleted media from db

---
 app/build.gradle                                         | 2 +-
 .../gallery/pro/activities/MainActivity.kt               | 9 ++++++---
 app/src/main/res/values-zh-rCN/strings.xml               | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index eacad08de..167129085 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -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'
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt
index ba2807965..a5b9d346a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt
@@ -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) {
             }
         }
 
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 661438648..73947644d 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -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 -->