fenix
/
Simple-Draw
mirror of https://github.com/SimpleMobileTools/Simple-Draw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix #52, properly handle storage permission at saving/loading files

This commit is contained in:
tibbi 2017-04-09 15:27:50 +02:00
parent 18019315e2
commit cca5e9d2b7
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/kotlin/com/simplemobiletools/draw/activities/MainActivity.kt
View File

@ -31,7 +31,8 @@ import java.io.FileOutputStream
class MainActivity : SimpleActivity(), MyCanvas.PathsChangedListener { class MainActivity : SimpleActivity(), MyCanvas.PathsChangedListener {
private val FOLDER_NAME = "images" private val FOLDER_NAME = "images"
private val FILE_NAME = "simple-draw.png" private val FILE_NAME = "simple-draw.png"
private val STORAGE_PERMISSION = 1 private val SAVE_IMAGE = 1
private val OPEN_FILE = 2
private var curPath = "" private var curPath = ""
private var color = 0 private var color = 0
@ -78,7 +79,7 @@ class MainActivity : SimpleActivity(), MyCanvas.PathsChangedListener {
R.id.menu_save -> trySaveImage() R.id.menu_save -> trySaveImage()
R.id.menu_share -> shareImage() R.id.menu_share -> shareImage()
R.id.clear -> my_canvas.clearCanvas() R.id.clear -> my_canvas.clearCanvas()
R.id.open_file -> openFile() R.id.open_file -> tryOpenFile()
R.id.change_background -> changeBackgroundClicked() R.id.change_background -> changeBackgroundClicked()
R.id.settings -> launchSettings() R.id.settings -> launchSettings()
R.id.about -> launchAbout() R.id.about -> launchAbout()
@ -90,14 +91,16 @@ class MainActivity : SimpleActivity(), MyCanvas.PathsChangedListener {
override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) { override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults) super.onRequestPermissionsResult(requestCode, permissions, grantResults)
if (requestCode == STORAGE_PERMISSION) {
if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) { if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
if (requestCode == SAVE_IMAGE) {
saveImage() saveImage()
} else if (requestCode == OPEN_FILE) {
openFile()
}
} else { } else {
toast(R.string.no_storage_permissions) toast(R.string.no_storage_permissions)
} }
} }
}
private fun launchSettings() { private fun launchSettings() {
startActivity(Intent(applicationContext, SettingsActivity::class.java)) startActivity(Intent(applicationContext, SettingsActivity::class.java))
@ -107,13 +110,21 @@ class MainActivity : SimpleActivity(), MyCanvas.PathsChangedListener {
startAboutActivity(R.string.app_name, LICENSE_KOTLIN, BuildConfig.VERSION_NAME) startAboutActivity(R.string.app_name, LICENSE_KOTLIN, BuildConfig.VERSION_NAME)
} }
private fun openFile() { private fun tryOpenFile() {
FilePickerDialog(this, curPath) { if (hasWriteStoragePermission()) {
tryOpenFile(it) openFile()
} else {
ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), OPEN_FILE)
} }
} }
private fun tryOpenFile(path: String) { private fun openFile() {
FilePickerDialog(this, curPath) {
openPath(it)
}
}
private fun openPath(path: String) {
if (path.endsWith(".svg")) { if (path.endsWith(".svg")) {
my_canvas.mBackgroundBitmap = null my_canvas.mBackgroundBitmap = null
Svg.loadSvg(this, File(path), my_canvas) Svg.loadSvg(this, File(path), my_canvas)
@ -133,10 +144,10 @@ class MainActivity : SimpleActivity(), MyCanvas.PathsChangedListener {
} }
private fun trySaveImage() { private fun trySaveImage() {
if (!hasWriteStoragePermission()) { if (hasWriteStoragePermission()) {
saveImage() saveImage()
} else { } else {
ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), STORAGE_PERMISSION) ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), SAVE_IMAGE)
} }
} }