From e2021bcc54a558ef22c808b2ee159534526c7242 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 23 Feb 2020 11:50:16 +0100
Subject: [PATCH] show a better error message at fixing date taken values, if
 none found

---
 .../simplemobiletools/gallery/pro/extensions/Activity.kt  | 8 ++++++++
 .../simplemobiletools/gallery/pro/extensions/Context.kt   | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt
index b23b28522..312235ba9 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt
@@ -453,6 +453,14 @@ fun Activity.fixDateTaken(paths: ArrayList<String>, showToasts: Boolean, hasResc
                 }
             }
 
+            if (!didUpdateFile) {
+                toast(R.string.no_date_takens_found)
+                runOnUiThread {
+                    callback?.invoke()
+                }
+                return@ensureBackgroundThread
+            }
+
             val resultSize = contentResolver.applyBatch(MediaStore.AUTHORITY, operations).size
             if (resultSize == 0) {
                 didUpdateFile = false
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt
index 8fe4f8b67..5834cf4fd 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt
@@ -958,7 +958,7 @@ fun Context.getFileDateTaken(path: String): Long {
             do {
                 try {
                     return cursor.getLongValue(MediaStore.Images.Media.DATE_TAKEN)
-                } catch (e: Exception) {
+                } catch (ignored: Exception) {
                 }
             } while (cursor.moveToNext())
         }