From b67a9e56a2720878eb1b6de97040943d6a201217 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 21 Jun 2017 18:55:55 +0200 Subject: [PATCH] use more advanced mimetype and action checking at sharing files --- app/build.gradle | 2 +- .../filemanager/adapters/ItemsAdapter.kt | 23 ++++++++++++++----- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 84eec3b8..960217b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -32,7 +32,7 @@ android { } dependencies { - compile 'com.simplemobiletools:commons:2.21.7' + compile 'com.simplemobiletools:commons:2.21.10' 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/adapters/ItemsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt index c6418609..17d376f6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt @@ -15,10 +15,7 @@ import com.simplemobiletools.commons.dialogs.ConfirmationDialog import com.simplemobiletools.commons.dialogs.FilePickerDialog import com.simplemobiletools.commons.dialogs.PropertiesDialog import com.simplemobiletools.commons.dialogs.RenameItemDialog -import com.simplemobiletools.commons.extensions.formatSize -import com.simplemobiletools.commons.extensions.getCacheStrategy -import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor -import com.simplemobiletools.commons.extensions.toast +import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.models.FileDirItem import com.simplemobiletools.filemanager.R import com.simplemobiletools.filemanager.activities.SimpleActivity @@ -27,6 +24,7 @@ import kotlinx.android.synthetic.main.list_item.view.* import java.io.File import java.util.* + class ItemsAdapter(val activity: SimpleActivity, var mItems: MutableList, val listener: ItemOperationsListener?, val itemClick: (FileDirItem) -> Unit) : RecyclerView.Adapter() { @@ -147,13 +145,26 @@ class ItemsAdapter(val activity: SimpleActivity, var mItems: MutableList): String { + val firstMimeType = items.first().path.getMimeTypeFromPath() + val firstMimeGroup = firstMimeType.substringBefore("/") + + items.forEach { + val mimeGroup = it.path.getMimeTypeFromPath().substringBefore("/") + if (mimeGroup != firstMimeGroup) { + return "*/*" + } + } + return firstMimeType + } + private fun copyMoveTo(isCopyOperation: Boolean) { val files = ArrayList() selectedPositions.forEach { files.add(File(mItems[it].path)) }