From 96b25a43b8028de61f003ed9050ab3a19b97f210 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 9 Nov 2016 23:37:39 +0100
Subject: [PATCH] make "Save as" the only saving option in the editor

---
 .../gallery/activities/EditActivity.kt        | 51 +++++--------------
 app/src/main/res/menu/menu_editor.xml         |  8 +--
 2 files changed, 15 insertions(+), 44 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt
index dfeebc180..745c5847a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt
@@ -22,7 +22,6 @@ import java.io.OutputStream
 class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener {
     val TAG: String = EditActivity::class.java.simpleName
 
-    var overrideOriginal = false
     lateinit var uri: Uri
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -56,8 +55,7 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
-            R.id.save -> {
-                overrideOriginal = true
+            R.id.save_as -> {
                 crop_image_view.getCroppedImageAsync()
                 true
             }
@@ -65,47 +63,30 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
                 crop_image_view.rotateImage(90)
                 true
             }
-            R.id.save_as -> {
-                saveAs()
-                true
-            }
             else -> super.onOptionsItemSelected(item)
         }
     }
 
-    private fun saveAs() {
-        overrideOriginal = false
-        crop_image_view.getCroppedImageAsync()
-    }
-
     override fun onCropImageComplete(view: CropImageView, result: CropImageView.CropResult) {
         if (result.error == null) {
             if (uri.scheme == "file") {
-                if (overrideOriginal)
-                    saveBitmapToFile(result.bitmap, uri.path)
-                else {
-                    SaveAsDialog(this, uri.path, object : SaveAsDialog.OnSaveAsListener {
+                SaveAsDialog(this, uri.path, object : SaveAsDialog.OnSaveAsListener {
+                    override fun onSaveAsSuccess(filename: String) {
+                        val parent = File(uri.path).parent
+                        val path = File(parent, filename).absolutePath
+                        saveBitmapToFile(result.bitmap, path)
+                    }
+                })
+            } else if (uri.scheme == "content") {
+                val newPath = Utils.getRealPathFromURI(applicationContext, uri) ?: ""
+                if (!newPath.isEmpty()) {
+                    SaveAsDialog(this, newPath, object : SaveAsDialog.OnSaveAsListener {
                         override fun onSaveAsSuccess(filename: String) {
                             val parent = File(uri.path).parent
                             val path = File(parent, filename).absolutePath
                             saveBitmapToFile(result.bitmap, path)
                         }
                     })
-                }
-            } else if (uri.scheme == "content") {
-                val newPath = Utils.getRealPathFromURI(applicationContext, uri) ?: ""
-                if (!newPath.isEmpty()) {
-                    if (overrideOriginal) {
-                        saveBitmapToFile(result.bitmap, newPath)
-                    } else {
-                        SaveAsDialog(this, newPath, object : SaveAsDialog.OnSaveAsListener {
-                            override fun onSaveAsSuccess(filename: String) {
-                                val parent = File(uri.path).parent
-                                val path = File(parent, filename).absolutePath
-                                saveBitmapToFile(result.bitmap, path)
-                            }
-                        })
-                    }
                 } else {
                     toast(R.string.image_editing_failed)
                     finish()
@@ -121,11 +102,6 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
 
     private fun saveBitmapToFile(bitmap: Bitmap, path: String) {
         val file = File(path)
-        if (overrideOriginal && !file.exists()) {
-            toast(R.string.error_saving_file)
-            finish()
-            return
-        }
 
         var out: OutputStream? = null
         try {
@@ -162,8 +138,7 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
                 toast(R.string.file_saved)
             }
 
-            if (overrideOriginal)
-                finish()
+            finish()
         })
     }
 
diff --git a/app/src/main/res/menu/menu_editor.xml b/app/src/main/res/menu/menu_editor.xml
index 5d417c0ef..6fc1f6f37 100644
--- a/app/src/main/res/menu/menu_editor.xml
+++ b/app/src/main/res/menu/menu_editor.xml
@@ -6,13 +6,9 @@
         android:icon="@mipmap/rotate"
         android:title="@string/rotate"
         app:showAsAction="ifRoom"/>
-    <item
-        android:id="@+id/save"
-        android:icon="@mipmap/check"
-        android:title="@string/save"
-        app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/save_as"
+        android:icon="@mipmap/check"
         android:title="@string/save_as"
-        app:showAsAction="never"/>
+        app:showAsAction="ifRoom"/>
 </menu>