From 105866987d925cc4c21e9a2cb0d0a2f932e8c482 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 6 Dec 2016 16:18:50 +0100
Subject: [PATCH] allow copying items in folders that contain no media, fix #62

---
 .../gallery/dialogs/PickAlbumDialog.kt         | 18 +++++++++++++++++-
 app/src/main/res/values-de/strings.xml         |  1 +
 app/src/main/res/values-es/strings.xml         |  1 +
 app/src/main/res/values-it/strings.xml         |  1 +
 app/src/main/res/values-ja/strings.xml         |  1 +
 app/src/main/res/values-pt-rPT/strings.xml     |  1 +
 app/src/main/res/values-ru/strings.xml         |  1 +
 app/src/main/res/values-sv/strings.xml         |  1 +
 app/src/main/res/values-zh/strings.xml         |  1 +
 app/src/main/res/values/strings.xml            |  1 +
 10 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickAlbumDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickAlbumDialog.kt
index fb023fa4c..da528a477 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickAlbumDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickAlbumDialog.kt
@@ -1,12 +1,15 @@
 package com.simplemobiletools.gallery.dialogs
 
 import android.app.AlertDialog
+import android.os.Environment
 import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
+import com.simplemobiletools.filepicker.dialogs.FilePickerDialog
 import com.simplemobiletools.gallery.R
 import com.simplemobiletools.gallery.activities.SimpleActivity
 import com.simplemobiletools.gallery.adapters.DirectoryAdapter
 import com.simplemobiletools.gallery.asynctasks.GetDirectoriesAsynctask
+import com.simplemobiletools.gallery.helpers.Config
 import kotlinx.android.synthetic.main.dialog_album_picker.view.*
 import java.util.*
 
@@ -21,8 +24,8 @@ class PickAlbumDialog(val activity: SimpleActivity, val callback: (path: String)
         dialog = AlertDialog.Builder(activity)
                 .setTitle(activity.resources.getString(R.string.select_destination))
                 .setView(view)
+                .setNeutralButton(R.string.other_folder, { dialogInterface, i -> showOtherFolder() })
                 .setPositiveButton(R.string.ok, null)
-                .setNegativeButton(R.string.cancel, null)
                 .create()
 
         dialog.setCanceledOnTouchOutside(true)
@@ -35,4 +38,17 @@ class PickAlbumDialog(val activity: SimpleActivity, val callback: (path: String)
             directoriesGrid.adapter = adapter
         }.execute()
     }
+
+    fun showOtherFolder() {
+        val initialPath = Environment.getExternalStorageDirectory().toString()
+        val showHidden = Config.newInstance(activity).showHiddenFolders
+        FilePickerDialog(activity, initialPath, false, showHidden, object : FilePickerDialog.OnFilePickerListener {
+            override fun onSuccess(pickedPath: String) {
+                callback.invoke(pickedPath)
+            }
+
+            override fun onFail(error: FilePickerDialog.FilePickerResult) {
+            }
+        })
+    }
 }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index d3670d105..1813fdac6 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -32,6 +32,7 @@
     <string name="source">Quelle</string>
     <string name="destination">Ziel</string>
     <string name="select_destination">Ziel auswählen</string>
+    <string name="other_folder">Other folder</string>
     <string name="invalid_destination">Konnte nicht an ausgewähltes Ziel schreiben</string>
     <string name="please_select_destination">Bitte wähle ein Ziel</string>
     <string name="source_and_destination_same">Source and destination cannot be the same</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 5b15a44d9..ca679572b 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -32,6 +32,7 @@
     <string name="source">Source</string>
     <string name="destination">Destination</string>
     <string name="select_destination">Select destination</string>
+    <string name="other_folder">Other folder</string>
     <string name="invalid_destination">Could not write to the selected destination</string>
     <string name="please_select_destination">Please select a destination</string>
     <string name="source_and_destination_same">Source and destination cannot be the same</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index a77ee7be9..309b83f08 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -32,6 +32,7 @@
     <string name="source">Fonte</string>
     <string name="destination">Destinazione</string>
     <string name="select_destination">Seleziona destinazione</string>
+    <string name="other_folder">Other folder</string>
     <string name="invalid_destination">Impossibile scrivere nella destinazione selezionata</string>
     <string name="please_select_destination">Seleziona una destinazione</string>
     <string name="source_and_destination_same">Sorgente e destinazione non possono essere uguali</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 972366c87..8c57bb44e 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -32,6 +32,7 @@
     <string name="source">元</string>
     <string name="destination">先</string>
     <string name="select_destination">宛先を選択</string>
+    <string name="other_folder">Other folder</string>
     <string name="invalid_destination">選択した宛先に書き込みできませんでした</string>
     <string name="please_select_destination">宛先を選択してください</string>
     <string name="source_and_destination_same">元と先を同じにすることはできません</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 0c114902d..a07e6c29f 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -32,6 +32,7 @@
     <string name="source">Origem</string>
     <string name="destination">Destino</string>
     <string name="select_destination">Selecione o destino</string>
+    <string name="other_folder">Other folder</string>
     <string name="invalid_destination">Não foi possível escrever no destino selecionado</string>
     <string name="please_select_destination">Por favor selecione um destino</string>
     <string name="source_and_destination_same">A origem e o destino não podem ser iguais</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 5ad807e72..04c571b99 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -33,6 +33,7 @@
     <string name="source">Путь источника</string>
     <string name="destination">Путь назначения</string>
     <string name="select_destination">Выберите путь назначения</string>
+    <string name="other_folder">Other folder</string>
     <string name="invalid_destination">Не удалось записать в выбранное место</string>
     <string name="please_select_destination">Пожалуйста, выберите путь назначения</string>
     <string name="source_and_destination_same">Исходный и конечный пути не могут совпадать</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index f8c938f4c..f185fc7c8 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -32,6 +32,7 @@
     <string name="source">Källa</string>
     <string name="destination">Mål</string>
     <string name="select_destination">Välj mål</string>
+    <string name="other_folder">Other folder</string>
     <string name="invalid_destination">Det gick inte att skriva till målet</string>
     <string name="please_select_destination">Please select a destination</string>
     <string name="source_and_destination_same">Source and destination cannot be the same</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 339a66230..b910cae85 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -33,6 +33,7 @@
     <string name="source">原路径</string>
     <string name="destination">目标</string>
     <string name="select_destination">选择目标</string>
+    <string name="other_folder">Other folder</string>
     <string name="invalid_destination">不能写入选中目标</string>
     <string name="please_select_destination">请选择先目标</string>
     <string name="source_and_destination_same">原路径和目标不能相同</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index aa5c3eecb..4d7c66d7b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,6 +32,7 @@
     <string name="source">Source</string>
     <string name="destination">Destination</string>
     <string name="select_destination">Select destination</string>
+    <string name="other_folder">Other folder</string>
     <string name="invalid_destination">Could not write to the selected destination</string>
     <string name="please_select_destination">Please select a destination</string>
     <string name="source_and_destination_same">Source and destination cannot be the same</string>