From 8ebdc91649e31f5747137d8a73e534f0ac125ea9 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 11 Mar 2017 22:56:57 +0100
Subject: [PATCH] update commons to 2.9.9

---
 app/build.gradle                                              | 2 +-
 .../simplemobiletools/gallery/activities/ViewPagerActivity.kt | 2 +-
 .../com/simplemobiletools/gallery/dialogs/CopyDialog.kt       | 4 ++--
 app/src/main/res/values-fr/strings.xml                        | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ce1f9f228..c4c7471c6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,7 +32,7 @@ android {
 }
 
 dependencies {
-    compile 'com.simplemobiletools:commons:2.9.8'
+    compile 'com.simplemobiletools:commons:2.9.9'
     compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0'
     compile 'com.theartofdev.edmodo:android-image-cropper:2.3.1'
     compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
index f8c464bf4..575902e37 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
@@ -193,7 +193,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
             try {
                 val file = File(it)
                 if (file.exists()) {
-                    toast(R.string.file_exists)
+                    toast(R.string.name_taken)
                     return@SaveAsDialog
                 }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/CopyDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/CopyDialog.kt
index 589338505..9bb13ed8b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/CopyDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/CopyDialog.kt
@@ -41,7 +41,7 @@ class CopyDialog(val activity: SimpleActivity, val files: ArrayList<File>, val c
                     return@setOnClickListener
                 }
 
-                if (sourcePath.trimEnd('/') == destinationPath.trimEnd('/')) {
+                if (sourcePath == destinationPath.trimEnd('/')) {
                     context.toast(R.string.source_and_destination_same)
                     return@setOnClickListener
                 }
@@ -54,7 +54,7 @@ class CopyDialog(val activity: SimpleActivity, val files: ArrayList<File>, val c
 
                 if (files.size == 1) {
                     if (File(destinationPath, files[0].name).exists()) {
-                        context.toast(R.string.file_exists)
+                        context.toast(R.string.name_taken)
                         return@setOnClickListener
                     }
                 }
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 7100ec49d..17d651065 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -100,4 +100,3 @@
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
 </resources>
-