Skip to content

Commit ff23ac8

Browse files
committed
if paths are on different storage at Move, lets just copy
1 parent 119db82 commit ff23ac8

File tree

8 files changed

+16
-5
lines changed

8 files changed

+16
-5
lines changed

app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CopyDialog.kt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import android.support.v4.util.Pair
55
import android.support.v7.app.AlertDialog
66
import android.view.LayoutInflater
77
import android.view.WindowManager
8+
import android.widget.Toast
89
import com.simplemobiletools.filemanager.Config
910
import com.simplemobiletools.filemanager.R
1011
import com.simplemobiletools.filemanager.Utils
@@ -18,13 +19,14 @@ import java.io.File
1819

1920
class CopyDialog(val activity: Activity, val files: List<File>, val path: String, val copyListener: CopyTask.CopyListener, val listener: OnCopyListener) {
2021
val mContext = activity
22+
2123
init {
2224
val view = LayoutInflater.from(mContext).inflate(R.layout.copy_item, null)
2325
view.source.text = "$path/"
2426

2527
view.destination.setOnClickListener {
2628
val config = Config.newInstance(mContext)
27-
FilePickerDialog(activity, path, false, config.showHidden, false, object: FilePickerDialog.OnFilePickerListener {
29+
FilePickerDialog(activity, path, false, config.showHidden, false, object : FilePickerDialog.OnFilePickerListener {
2830
override fun onFail(error: FilePickerDialog.FilePickerResult) {
2931
}
3032

@@ -61,7 +63,7 @@ class CopyDialog(val activity: Activity, val files: List<File>, val path: String
6163
}
6264

6365
if (view.dialog_radio_group.checkedRadioButtonId == R.id.dialog_radio_copy) {
64-
Utils.showToast(context, R.string.copying)
66+
context.toast(R.string.copying)
6567
val pair = Pair<List<File>, File>(files, destinationDir)
6668
CopyTask(copyListener, mContext).execute(pair)
6769
dismiss()
@@ -75,6 +77,11 @@ class CopyDialog(val activity: Activity, val files: List<File>, val path: String
7577

7678
dismiss()
7779
listener.onSuccess()
80+
} else {
81+
context.toast(R.string.copying_no_delete, Toast.LENGTH_LONG)
82+
val pair = Pair<List<File>, File>(files, destinationDir)
83+
CopyTask(copyListener, mContext).execute(pair)
84+
dismiss()
7885
}
7986
}
8087
})

app/src/main/kotlin/com/simplemobiletools/filemanager/extensions/context.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ import android.media.MediaScannerConnection
55
import android.widget.Toast
66
import java.io.File
77

8-
fun Context.toast(id: Int) = Toast.makeText(this, resources.getString(id), Toast.LENGTH_SHORT).show()
9-
10-
fun Context.toast(message: String) = Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
8+
fun Context.toast(id: Int, length: Int = Toast.LENGTH_SHORT) = Toast.makeText(this, resources.getString(id), length).show()
119

1210
fun Context.rescanItem(item: File) {
1311
if (item.isDirectory) {

app/src/main/res/values-de/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<string name="source_and_destination_same">Source and destination cannot be the same</string>
3333
<string name="copy_failed">Konnte die Datei nicht kopieren</string>
3434
<string name="copying">Kopiere</string>
35+
<string name="copying_no_delete">Copying, please delete source files manually</string>
3536
<string name="initial_breadcrumb">home</string>
3637
<string name="ok">OK</string>
3738
<string name="cancel">Abbrechen</string>

app/src/main/res/values-it/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<string name="source_and_destination_same">Source and destination cannot be the same</string>
3333
<string name="copy_failed">Impossibile copiare i file</string>
3434
<string name="copying">Copia in corso</string>
35+
<string name="copying_no_delete">Copying, please delete source files manually</string>
3536
<string name="initial_breadcrumb">home</string>
3637
<string name="ok">OK</string>
3738
<string name="cancel">Annulla</string>

app/src/main/res/values-ja/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<string name="source_and_destination_same">Source and destination cannot be the same</string>
3333
<string name="copy_failed">ファイルをコピーできませんでした</string>
3434
<string name="copying">コピー中</string>
35+
<string name="copying_no_delete">Copying, please delete source files manually</string>
3536
<string name="initial_breadcrumb">ホーム</string>
3637
<string name="ok">OK</string>
3738
<string name="cancel">Cancel</string>

app/src/main/res/values-pt-rPT/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<string name="source_and_destination_same">Source and destination cannot be the same</string>
3333
<string name="copy_failed">Não foi possível copiar os ficheiros</string>
3434
<string name="copying">A copiar</string>
35+
<string name="copying_no_delete">Copying, please delete source files manually</string>
3536
<string name="initial_breadcrumb">início</string>
3637
<string name="ok">OK</string>
3738
<string name="cancel">Cancelar</string>

app/src/main/res/values-sv/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<string name="source_and_destination_same">Source and destination cannot be the same</string>
3333
<string name="copy_failed">Kunde inte kopiera filen</string>
3434
<string name="copying">Kopierar</string>
35+
<string name="copying_no_delete">Copying, please delete source files manually</string>
3536
<string name="initial_breadcrumb">home</string>
3637
<string name="ok">OK</string>
3738
<string name="cancel">Cancel</string>

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<string name="source_and_destination_same">Source and destination cannot be the same</string>
3333
<string name="copy_failed">Could not copy the files</string>
3434
<string name="copying">Copying</string>
35+
<string name="copying_no_delete">Copying, please delete source files manually</string>
3536
<string name="initial_breadcrumb">home</string>
3637
<string name="ok">OK</string>
3738
<string name="cancel">Cancel</string>

0 commit comments

Comments
 (0)