wbrawner/Simple-File-Manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix copying files to sd card

Browse source
This commit is contained in:
tibbi 2016-11-05 19:14:28 +01:00
parent 68e5b4cf79
commit f8e855ec15
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/com/simplemobiletools/filemanager/asynctasks/CopyTask.kt
View file

@ -1,15 +1,14 @@
package com.simplemobiletools.filemanager.asynctasks
import android.content.Context
import android.os.AsyncTask
import android.support.v4.util.Pair
import android.util.Log
import java.io.File
import java.io.FileInputStream
import java.io.FileOutputStream
import java.io.IOException
import com.simplemobiletools.filemanager.Utils
import java.io.*
import java.lang.ref.WeakReference
class CopyTask(listener: CopyTask.CopyListener) : AsyncTask<Pair<List<File>, File>, Void, Boolean>() {
class CopyTask(listener: CopyTask.CopyListener, val context: Context) : AsyncTask<Pair<List<File>, File>, Void, Boolean>() {
private val TAG = CopyTask::class.java.simpleName
private var mListener: WeakReference<CopyListener>? = null
private var destinationDir: File? = null
@ -52,7 +51,14 @@ class CopyTask(listener: CopyTask.CopyListener) : AsyncTask<Pair<List<File>, Fil
}
val inputStream = FileInputStream(source)
val out = FileOutputStream(destination)
var out: OutputStream?
if (Utils.needsStupidWritePermissions(context, destination.absolutePath)) {
var document = Utils.getFileDocument(context, destination.absolutePath)
document = document.createFile("", destination.name)
out = context.contentResolver.openOutputStream(document.uri)
} else {
out = FileOutputStream(destination)
}
val buf = ByteArray(1024)
var len: Int
@ -60,7 +66,7 @@ class CopyTask(listener: CopyTask.CopyListener) : AsyncTask<Pair<List<File>, Fil
len = inputStream.read(buf)
if (len <= 0)
break
out.write(buf, 0, len)
out!!.write(buf, 0, len)
}
}
}

2
app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CopyDialog.kt
View file

@ -58,7 +58,7 @@ class CopyDialog(val activity: Activity, val files: List<File>, val path: String
if (view.dialog_radio_group.checkedRadioButtonId == R.id.dialog_radio_copy) {
Utils.showToast(context, R.string.copying)
val pair = Pair<List<File>, File>(files, destinationDir)
CopyTask(copyListener).execute(pair)
CopyTask(copyListener, mContext).execute(pair)
dismiss()
} else {
for (f in files) {