fenix/Simple-File-Manager
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-File-Manager.git synced 2025-04-25 07:28:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

use more advanced mimetype and action checking at sharing files

Browse Source
This commit is contained in:
tibbi 2017-06-21 18:55:55 +02:00
parent b27c9bb491
commit b67a9e56a2
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -32,7 +32,7 @@ android {
} }
dependencies { dependencies {
compile 'com.simplemobiletools:commons:2.21.7' compile 'com.simplemobiletools:commons:2.21.10'
compile 'com.bignerdranch.android:recyclerview-multiselect:0.2' compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
} }

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

@ -15,10 +15,7 @@ import com.simplemobiletools.commons.dialogs.ConfirmationDialog
import com.simplemobiletools.commons.dialogs.FilePickerDialog import com.simplemobiletools.commons.dialogs.FilePickerDialog
import com.simplemobiletools.commons.dialogs.PropertiesDialog import com.simplemobiletools.commons.dialogs.PropertiesDialog
import com.simplemobiletools.commons.dialogs.RenameItemDialog import com.simplemobiletools.commons.dialogs.RenameItemDialog
import com.simplemobiletools.commons.extensions.formatSize import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.extensions.getCacheStrategy
import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor
import com.simplemobiletools.commons.extensions.toast
import com.simplemobiletools.commons.models.FileDirItem import com.simplemobiletools.commons.models.FileDirItem
import com.simplemobiletools.filemanager.R import com.simplemobiletools.filemanager.R
import com.simplemobiletools.filemanager.activities.SimpleActivity import com.simplemobiletools.filemanager.activities.SimpleActivity
@ -27,6 +24,7 @@ import kotlinx.android.synthetic.main.list_item.view.*
import java.io.File import java.io.File
import java.util.* import java.util.*
class ItemsAdapter(val activity: SimpleActivity, var mItems: MutableList<FileDirItem>, val listener: ItemOperationsListener?, val itemClick: (FileDirItem) -> Unit) : class ItemsAdapter(val activity: SimpleActivity, var mItems: MutableList<FileDirItem>, val listener: ItemOperationsListener?, val itemClick: (FileDirItem) -> Unit) :
RecyclerView.Adapter<ItemsAdapter.ViewHolder>() { RecyclerView.Adapter<ItemsAdapter.ViewHolder>() {
@ -147,13 +145,26 @@ class ItemsAdapter(val activity: SimpleActivity, var mItems: MutableList<FileDir
val shareTitle = activity.resources.getString(R.string.share_via) val shareTitle = activity.resources.getString(R.string.share_via)
Intent().apply { Intent().apply {
action = Intent.ACTION_SEND_MULTIPLE action = if (uris.size <= 1) Intent.ACTION_SEND else Intent.ACTION_SEND_MULTIPLE
putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris) putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris)
type = "*/*" type = getMimeType(selectedItems)
activity.startActivity(Intent.createChooser(this, shareTitle)) activity.startActivity(Intent.createChooser(this, shareTitle))
} }
} }
private fun getMimeType(items: List<FileDirItem>): 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) { private fun copyMoveTo(isCopyOperation: Boolean) {
val files = ArrayList<File>() val files = ArrayList<File>()
selectedPositions.forEach { files.add(File(mItems[it].path)) } selectedPositions.forEach { files.add(File(mItems[it].path)) }