wbrawner/Simple-Commons
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use the copy/delete way of moving of folders

Browse source
This commit is contained in:
tibbi 2017-12-25 12:37:21 +01:00
parent 72c4c26bd5
commit 7b040bdf4d
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -6,7 +6,7 @@ buildscript {
propMinSdkVersion = 16
propTargetSdkVersion = propCompileSdkVersion
propVersionCode = 1
propVersionName = '3.4.0'
propVersionName = '3.4.1'
kotlin_version = '1.2.10'
support_libs = '27.0.2'
}

4
commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSimpleActivity.kt
View file

@ -174,7 +174,7 @@ open class BaseSimpleActivity : AppCompatActivity() {
}
if (files.size == 1) {
if (File(destinationFolder.absolutePath, files[0].name).exists()) {
if (File(destination, files[0].name).exists()) {
toast(R.string.name_taken)
return
}
@ -186,7 +186,7 @@ open class BaseSimpleActivity : AppCompatActivity() {
toast(R.string.copying)
startCopyMove(files, destinationFolder, isCopyOperation, copyPhotoVideoOnly)
} else {
if (isPathOnSD(source) || isPathOnSD(destinationFolder.absolutePath)) {
if (isPathOnSD(source) || isPathOnSD(destination) || files.first().isDirectory) {
handleSAFDialog(File(source)) {
toast(R.string.moving)
startCopyMove(files, destinationFolder, false, copyPhotoVideoOnly)