fenix/Simple-Camera
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git synced 2025-06-27 09:02:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

adding some checks to Kitkat SD card permission handling

Browse Source
This commit is contained in:
tibbi
2016-11-06 00:23:36 +01:00
parent 76c2312b6d
commit d74800dcc2
18 changed files with 151 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt
View File

@ -1,6 +1,9 @@
package com.simplemobiletools.camera.activities
import android.annotation.TargetApi
import android.app.Activity
import android.content.Intent
import android.os.Build
import android.os.Bundle
import android.support.v4.app.TaskStackBuilder
import android.view.Menu
@ -8,10 +11,17 @@ import android.view.MenuItem
import android.view.View
import android.widget.AdapterView
import com.simplemobiletools.camera.R
import com.simplemobiletools.camera.dialogs.WritePermissionDialog
import com.simplemobiletools.camera.extensions.isKitkat
import com.simplemobiletools.camera.extensions.isPathOnSD
import com.simplemobiletools.filepicker.dialogs.FilePickerDialog
import kotlinx.android.synthetic.main.activity_settings.*
import java.io.File
class SettingsActivity : SimpleActivity() {
val OPEN_DOCUMENT_TREE = 1
var mCurrPath: String = ""
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_settings)
@ -49,22 +59,58 @@ class SettingsActivity : SimpleActivity() {
}
private fun setupSavePhotosFolder() {
var currPath = mConfig.savePhotosFolder
settings_save_photos.text = currPath.substring(currPath.lastIndexOf("/") + 1)
mCurrPath = mConfig.savePhotosFolder
settings_save_photos.text = mCurrPath.substring(mCurrPath.lastIndexOf("/") + 1)
settings_save_photos_holder.setOnClickListener {
FilePickerDialog(this, currPath, false, false, false, object: FilePickerDialog.OnFilePickerListener {
FilePickerDialog(this, mCurrPath, false, false, false, object : FilePickerDialog.OnFilePickerListener {
override fun onFail(error: FilePickerDialog.FilePickerResult) {
}
override fun onSuccess(pickedPath: String) {
currPath = pickedPath.trimEnd('/')
mConfig.savePhotosFolder = currPath
settings_save_photos.text = currPath.substring(currPath.lastIndexOf("/") + 1)
mCurrPath = pickedPath.trimEnd('/')
if (!File(pickedPath).canWrite() && isPathOnSD(pickedPath) && isKitkat() && mConfig.treeUri.isEmpty()) {
WritePermissionDialog(this@SettingsActivity, object : WritePermissionDialog.OnWritePermissionListener {
override fun onCancelled() {
mCurrPath = mConfig.savePhotosFolder
}
override fun onConfirmed() {
val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)
startActivityForResult(intent, OPEN_DOCUMENT_TREE)
}
})
} else {
mConfig.savePhotosFolder = mCurrPath
settings_save_photos.text = mCurrPath.substring(mCurrPath.lastIndexOf("/") + 1)
}
}
})
}
}
@TargetApi(Build.VERSION_CODES.KITKAT)
override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
super.onActivityResult(requestCode, resultCode, resultData)
if (requestCode == OPEN_DOCUMENT_TREE) {
if (resultCode == Activity.RESULT_OK && resultData != null) {
mConfig.savePhotosFolder = mCurrPath
settings_save_photos.text = mCurrPath.substring(mCurrPath.lastIndexOf("/") + 1)
saveTreeUri(resultData)
} else {
mCurrPath = mConfig.savePhotosFolder
}
}
}
@TargetApi(Build.VERSION_CODES.KITKAT)
private fun saveTreeUri(resultData: Intent) {
val treeUri = resultData.data
mConfig.treeUri = resultData.data.toString()
val takeFlags = Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
contentResolver.takePersistableUriPermission(treeUri, takeFlags)
}
private fun setupSound() {
settings_sound.isChecked = mConfig.isSoundEnabled
settings_sound_holder.setOnClickListener {

34
app/src/main/kotlin/com/simplemobiletools/camera/dialogs/WritePermissionDialog.kt Normal file
View File

@ -0,0 +1,34 @@
package com.simplemobiletools.camera.dialogs
import android.content.Context
import android.support.v7.app.AlertDialog
import android.view.LayoutInflater
import com.simplemobiletools.camera.R
class WritePermissionDialog(val context: Context, val listener: OnWritePermissionListener) {
var dialog: AlertDialog? = null
init {
val view = LayoutInflater.from(context).inflate(R.layout.dialog_write_permission, null)
dialog = AlertDialog.Builder(context)
.setTitle(context.resources.getString(R.string.confirm_storage_access_title))
.setView(view)
.setPositiveButton(R.string.ok, { dialog, which -> dialogConfirmed() })
.setOnCancelListener { listener?.onCancelled() }
.create()
dialog?.show()
}
private fun dialogConfirmed() {
dialog?.dismiss()
listener.onConfirmed()
}
interface OnWritePermissionListener {
fun onConfirmed()
fun onCancelled()
}
}

9
app/src/main/kotlin/com/simplemobiletools/camera/extensions/Context.kt Normal file
View File

@ -0,0 +1,9 @@
package com.simplemobiletools.camera.extensions
import android.content.Context
import android.os.Build
import com.simplemobiletools.filepicker.extensions.getSDCardPath
fun Context.isPathOnSD(path: String) = path.startsWith(getSDCardPath())
fun Context.isKitkat() = Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT