update commons to 2.12.2

This commit is contained in:
tibbi 2017-03-16 22:54:42 +01:00
parent 733ae07ebc
commit 8e23443f79
2 changed files with 22 additions and 24 deletions

View File

@ -33,7 +33,7 @@ android {
}
dependencies {
compile 'com.simplemobiletools:commons:2.8.8'
compile 'com.simplemobiletools:commons:2.12.2'
compile 'joda-time:joda-time:2.9.1'
compile 'com.facebook.stetho:stetho:1.4.1'
compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'

View File

@ -246,34 +246,32 @@ class MainActivity : SimpleActivity(), NavigationListener {
FilePickerDialog(this, pickFile = false) {
val source = getDatabasePath(DBHelper.DB_NAME)
val destination = File(it, DBHelper.DB_NAME)
if (isShowingPermDialog(destination)) {
return@FilePickerDialog
}
handleSAFDialog(destination) {
Thread({
if (source.exists()) {
val inputStream = FileInputStream(source)
val outputStream: OutputStream?
Thread({
if (source.exists()) {
val inputStream = FileInputStream(source)
val outputStream: OutputStream?
if (needsStupidWritePermissions(destination.absolutePath)) {
var document = getFileDocument(destination.absolutePath, config.treeUri) ?: return@Thread
if (!destination.exists()) {
document = document.createFile("", destination.name)
if (needsStupidWritePermissions(destination.absolutePath)) {
var document = getFileDocument(destination.absolutePath, config.treeUri) ?: return@Thread
if (!destination.exists()) {
document = document.createFile("", destination.name)
}
outputStream = contentResolver.openOutputStream(document.uri)
} else {
outputStream = FileOutputStream(destination)
}
outputStream = contentResolver.openOutputStream(document.uri)
} else {
outputStream = FileOutputStream(destination)
}
copyStream(inputStream, outputStream)
inputStream.close()
outputStream?.close()
copyStream(inputStream, outputStream)
inputStream.close()
outputStream?.close()
runOnUiThread {
toast(R.string.database_exported_successfully)
runOnUiThread {
toast(R.string.database_exported_successfully)
}
}
}
}).start()
}).start()
}
}
}