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

create a helper function for displaying stupid kitkat permissions dialog

Browse Source
This commit is contained in:
tibbi
2016-11-06 20:36:55 +01:00
parent c71f94d9ec
commit 6c9c072dc9
5 changed files with 46 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt
View File

@ -1,7 +1,6 @@
package com.simplemobiletools.gallery.activities
import android.app.Activity
import android.content.Intent
import android.graphics.Bitmap
import android.media.MediaScannerConnection
import android.net.Uri
@ -9,11 +8,8 @@ import android.os.Bundle
import android.util.Log
import android.view.Menu
import android.view.MenuItem
import com.simplemobiletools.gallery.Config
import com.simplemobiletools.gallery.Constants
import com.simplemobiletools.gallery.R
import com.simplemobiletools.gallery.Utils
import com.simplemobiletools.gallery.dialogs.WritePermissionDialog
import com.simplemobiletools.gallery.extensions.toast
import com.theartofdev.edmodo.cropper.CropImageView
import kotlinx.android.synthetic.main.activity_edit.*
@ -101,15 +97,8 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
var out: OutputStream? = null
try {
if (Utils.needsStupidWritePermissions(this, path)) {
if (!file.canWrite() && Config.newInstance(this).treeUri.isEmpty()) {
WritePermissionDialog(this, object : WritePermissionDialog.OnWritePermissionListener {
override fun onConfirmed() {
val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)
startActivityForResult(intent, Constants.OPEN_DOCUMENT_TREE)
}
})
if (Utils.isShowingWritePermissions(this, file))
return
}
val document = Utils.getFileDocument(this, path)
out = contentResolver.openOutputStream(document.uri)

13
app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/RenameItemDialog.kt
View File

@ -1,13 +1,10 @@
package com.simplemobiletools.gallery.dialogs
import android.app.Activity
import android.content.Intent
import android.media.MediaScannerConnection
import android.support.v7.app.AlertDialog
import android.view.LayoutInflater
import android.view.WindowManager
import com.simplemobiletools.gallery.Config
import com.simplemobiletools.gallery.Constants
import com.simplemobiletools.gallery.R
import com.simplemobiletools.gallery.Utils
import com.simplemobiletools.gallery.extensions.toast
@ -53,15 +50,9 @@ class RenameItemDialog(val activity: Activity, val file: File, val listener: OnR
val newFile = File(file.parent, "$fileName.$extension")
if (Utils.needsStupidWritePermissions(context, file.absolutePath)) {
if (!file.canWrite() && Config.newInstance(context).treeUri.isEmpty()) {
WritePermissionDialog(activity, object : WritePermissionDialog.OnWritePermissionListener {
override fun onConfirmed() {
val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)
activity.startActivityForResult(intent, Constants.OPEN_DOCUMENT_TREE)
}
})
if (Utils.isShowingWritePermissions(activity, file))
return@setOnClickListener
}
val document = Utils.Companion.getFileDocument(context, file.absolutePath)
if (document.canWrite())
document.renameTo(newFile.name)