arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-02-08 21:52:47 +00:00
Code Issues Releases Wiki Activity

Import from file: dismiss dialog and print an error in a missed error case.

Browse Source
This commit is contained in:
Tom Hacohen 2019-02-23 21:24:26 +00:00
parent 51a29b4401
commit 4fb49cf5f4
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/src/main/java/com/etesync/syncadapter/ui/importlocal/ImportFragment.kt
View File

@ -139,22 +139,31 @@ class ImportFragment : DialogFragment() {
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
when (requestCode) { when (requestCode) {
REQUEST_CODE -> if (resultCode == Activity.RESULT_OK) { REQUEST_CODE -> {
if (data != null) { if (resultCode == Activity.RESULT_OK) {
// Get the URI of the selected file if (data != null) {
val uri = data.data // Get the URI of the selected file
App.log.info("Importing uri = " + uri!!.toString()) val uri = data.data
try { App.log.info("Importing uri = " + uri!!.toString())
importFile = File(com.etesync.syncadapter.utils.FileUtils.getPath(context!!, uri)) try {
importFile = File(com.etesync.syncadapter.utils.FileUtils.getPath(context!!, uri))
Thread(ImportCalendarsLoader()).start()
} catch (e: Exception) {
App.log.severe("File select error: ${e.message}")
val importResult = ImportResult()
importResult.e = e
(activity as ResultFragment.OnImportCallback).onImportResult(importResult)
dismissAllowingStateLoss()
}
Thread(ImportCalendarsLoader()).start()
} catch (e: Exception) {
App.log.severe("File select error: " + e.localizedMessage)
} }
} else {
dismissAllowingStateLoss()
} }
} else {
dismissAllowingStateLoss()
} }
} }
super.onActivityResult(requestCode, resultCode, data) super.onActivityResult(requestCode, resultCode, data)