From 2057c14deaa0960684b407894f8e2feb0130b032 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 5 Nov 2016 22:56:29 +0100
Subject: [PATCH] check the new permission at copying to SD card

---
 .../filemanager/activities/MainActivity.kt    | 29 ++++++++++++-------
 .../filemanager/dialogs/CopyDialog.kt         | 12 ++++++++
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt
index 3cc90102..02a74ac5 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt
@@ -25,7 +25,6 @@ import kotlinx.android.synthetic.main.activity_main.*
 import java.io.File
 
 class MainActivity : SimpleActivity(), ItemsFragment.ItemInteractionListener, Breadcrumbs.BreadcrumbsListener {
-    val OPEN_DOCUMENT_TREE = 1
     var mBasePath = getInternalStoragePath()
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -138,10 +137,10 @@ class MainActivity : SimpleActivity(), ItemsFragment.ItemInteractionListener, Br
     fun checkStupidAndroidFiveSDCardWritePermission(pickedPath: String): Boolean {
         val file = File(pickedPath)
         return if (!file.canWrite() && Utils.needsStupidWritePermissions(applicationContext, pickedPath) && mConfig.treeUri.isEmpty()) {
-            WritePermissionDialog(this, object: WritePermissionDialog.OnWritePermissionListener {
+            WritePermissionDialog(this, object : WritePermissionDialog.OnWritePermissionListener {
                 override fun onConfirmed() {
                     val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)
-                    startActivityForResult(intent, OPEN_DOCUMENT_TREE)
+                    startActivityForResult(intent, OPEN_DOCUMENT_TREE_AND_CHANGE_PATH)
                 }
             })
             false
@@ -149,28 +148,36 @@ class MainActivity : SimpleActivity(), ItemsFragment.ItemInteractionListener, Br
             true
     }
 
-    @TargetApi(Build.VERSION_CODES.KITKAT)
     public override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
         super.onActivityResult(requestCode, resultCode, resultData)
-        if (requestCode == OPEN_DOCUMENT_TREE) {
+        if (requestCode == OPEN_DOCUMENT_TREE_AND_CHANGE_PATH) {
             if (resultCode == Activity.RESULT_OK && resultData != null) {
-                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)
-
+                saveTreeUri(resultData)
                 changePath(getSDCardPath())
             } else {
                 changePath(getInternalStoragePath())
             }
+        } else if (requestCode == OPEN_DOCUMENT_TREE && resultCode == Activity.RESULT_OK && resultData != null) {
+            saveTreeUri(resultData)
         }
     }
 
+    @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)
+    }
+
     companion object {
         private val STORAGE_PERMISSION = 1
         private val BACK_PRESS_TIMEOUT = 5000
 
+        val OPEN_DOCUMENT_TREE_AND_CHANGE_PATH = 1
+        val OPEN_DOCUMENT_TREE = 2
+
         private var mWasBackJustPressed: Boolean = false
     }
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CopyDialog.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CopyDialog.kt
index 5819c130..dd89a068 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CopyDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CopyDialog.kt
@@ -1,6 +1,7 @@
 package com.simplemobiletools.filemanager.dialogs
 
 import android.app.Activity
+import android.content.Intent
 import android.support.v4.util.Pair
 import android.support.v7.app.AlertDialog
 import android.view.LayoutInflater
@@ -9,6 +10,7 @@ import android.widget.Toast
 import com.simplemobiletools.filemanager.Config
 import com.simplemobiletools.filemanager.R
 import com.simplemobiletools.filemanager.Utils
+import com.simplemobiletools.filemanager.activities.MainActivity
 import com.simplemobiletools.filemanager.asynctasks.CopyTask
 import com.simplemobiletools.filemanager.extensions.rescanItem
 import com.simplemobiletools.filemanager.extensions.toast
@@ -70,6 +72,16 @@ class CopyDialog(val activity: Activity, val files: List<File>, val path: String
                     }
                 }
 
+                if (Utils.needsStupidWritePermissions(context, destinationPath) && Config.newInstance(context).treeUri.isEmpty()) {
+                    WritePermissionDialog(activity, object: WritePermissionDialog.OnWritePermissionListener {
+                        override fun onConfirmed() {
+                            val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)
+                            activity.startActivityForResult(intent, MainActivity.OPEN_DOCUMENT_TREE)
+                        }
+                    })
+                    return@setOnClickListener
+                }
+
                 if (view.dialog_radio_group.checkedRadioButtonId == R.id.dialog_radio_copy) {
                     context.toast(R.string.copying)
                     val pair = Pair<List<File>, File>(files, destinationDir)