allow deleting folders if some are selected

tibbi · tibbi · commit 4202d9035cc2 · 2017-03-15T23:04:39.000+01:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -32,7 +32,7 @@ android {
 }
 
 dependencies {
-    compile 'com.simplemobiletools:commons:2.11.5'
+    compile 'com.simplemobiletools:commons:2.11.6'
     compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt
@@ -189,7 +189,8 @@ class ItemsFragment : android.support.v4.app.Fragment(), ItemsAdapter.ItemOperat
     }
 
     override fun deleteFiles(files: ArrayList<File>) {
-        (activity as SimpleActivity).deleteFiles(files) {
+        val hasFolder = files.any { it.isDirectory }
+        (activity as SimpleActivity).deleteFiles(files, hasFolder) {
             if (!it) {
                 activity.runOnUiThread {
                     activity.toast(R.string.unknown_error_occurred)

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ android {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`dependencies {`
`35`		`- compile 'com.simplemobiletools:commons:2.11.5'`
	`35`	`+ compile 'com.simplemobiletools:commons:2.11.6'`
`36`	`36`	`compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'`
`37`	`37`	`compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,8 @@ class ItemsFragment : android.support.v4.app.Fragment(), ItemsAdapter.ItemOperat`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`override fun deleteFiles(files: ArrayList<File>) {`
`192`		`- (activity as SimpleActivity).deleteFiles(files) {`
	`192`	`+ val hasFolder = files.any { it.isDirectory }`
	`193`	`+ (activity as SimpleActivity).deleteFiles(files, hasFolder) {`
`193`	`194`	`if (!it) {`
`194`	`195`	`activity.runOnUiThread {`
`195`	`196`	`activity.toast(R.string.unknown_error_occurred)`