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

update commons to 2.12.2

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

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

44
app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
View File

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