get use of some filepicker extensions

This commit is contained in:
tibbi
2016-11-15 20:36:31 +01:00
parent 60d46d2f56
commit 5e93e4225a
5 changed files with 23 additions and 60 deletions

View File

@ -13,10 +13,10 @@ import android.widget.AdapterView
import com.simplemobiletools.camera.Constants
import com.simplemobiletools.camera.R
import com.simplemobiletools.camera.dialogs.WritePermissionDialog
import com.simplemobiletools.camera.extensions.needsStupidWritePermissions
import com.simplemobiletools.filepicker.dialogs.FilePickerDialog
import com.simplemobiletools.filepicker.extensions.getBasePath
import com.simplemobiletools.filepicker.extensions.getHumanReadablePath
import com.simplemobiletools.filepicker.extensions.needsStupidWritePermissions
import kotlinx.android.synthetic.main.activity_settings.*
import java.io.File
@ -100,9 +100,7 @@ class SettingsActivity : SimpleActivity() {
path
}
private fun getStorageName(basePath: String): String {
return getHumanReadablePath(basePath) + "/"
}
private fun getStorageName(basePath: String) = getHumanReadablePath(basePath) + "/"
@TargetApi(Build.VERSION_CODES.KITKAT)
override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {

View File

@ -1,26 +0,0 @@
package com.simplemobiletools.camera.extensions
import android.content.Context
import android.net.Uri
import android.os.Build
import android.support.v4.provider.DocumentFile
import com.simplemobiletools.camera.Config
import com.simplemobiletools.filepicker.extensions.getSDCardPath
fun Context.needsStupidWritePermissions(path: String) = isPathOnSD(path) && isKitkat() && !getSDCardPath().isEmpty()
fun Context.isPathOnSD(path: String) = path.startsWith(getSDCardPath())
fun Context.isKitkat() = Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT
fun Context.getFileDocument(path: String): DocumentFile {
val relativePath = path.substring(getSDCardPath().length + 1)
var document = DocumentFile.fromTreeUri(this, Uri.parse(Config.newInstance(this).treeUri))
val parts = relativePath.split("/")
for (part in parts) {
val currDocument = document.findFile(part)
if (currDocument != null)
document = currDocument
}
return document
}