Skip to content

Commit e9afd1c

Browse files
committed
adding a couple changes related to handling GET_CONTENT intent with multiple files
1 parent 27aafba commit e9afd1c

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ android {
4242
}
4343

4444
dependencies {
45-
implementation 'com.simplemobiletools:commons:5.0.18'
45+
implementation 'com.simplemobiletools:commons:5.2.1'
4646

4747
implementation files('../libs/RootTools.jar')
4848
}

app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ class MainActivity : SimpleActivity() {
318318

319319
fun pickedPaths(paths: ArrayList<String>) {
320320
val newPaths = paths.map { getFilePublicUri(File(it), BuildConfig.APPLICATION_ID).toString() } as ArrayList
321-
val clipData = ClipData("Attachment", arrayOf(newPaths.getMimeType()), ClipData.Item(newPaths.removeAt(0)))
321+
val clipData = ClipData("Attachment", arrayOf(paths.getMimeType()), ClipData.Item(newPaths.removeAt(0)))
322322

323323
newPaths.forEach {
324324
clipData.addItem(ClipData.Item(it))

app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,12 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
143143

144144
private fun confirmSelection() {
145145
if (selectedKeys.isNotEmpty()) {
146-
val paths = getSelectedFileDirItems().filter { !it.isDirectory }.map { it.path } as ArrayList<String>
147-
listener?.selectedPaths(paths)
146+
val paths = getSelectedFileDirItems().asSequence().filter { !it.isDirectory }.map { it.path }.toMutableList() as ArrayList<String>
147+
if (paths.isEmpty()) {
148+
finishActMode()
149+
} else {
150+
listener?.selectedPaths(paths)
151+
}
148152
}
149153
}
150154

0 commit comments

Comments
 (0)