arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2024-12-23 15:18:14 +00:00
Code Issues Releases Wiki Activity

Import: have a user facing error instead of a crash.

Browse Source
This commit is contained in:
Tom Hacohen 2020-10-27 08:53:18 +02:00
parent b5aafc11c5
commit db993e81eb
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -234,9 +234,10 @@ class ImportFragment(private val account: Account, private val uid: String, priv
val localCalendar: LocalCalendar? val localCalendar: LocalCalendar?
try { try {
localCalendar = LocalCalendar.findByName(account, provider, LocalCalendar.Factory, uid!!) localCalendar = LocalCalendar.findByName(account, provider, LocalCalendar.Factory, uid)
if (localCalendar == null) { if (localCalendar == null) {
throw FileNotFoundException("Failed to load local resource.") result.e = FileNotFoundException("Failed to load local resource.")
return result
} }
} catch (e: CalendarStorageException) { } catch (e: CalendarStorageException) {
Logger.log.info("Fail" + e.localizedMessage) Logger.log.info("Fail" + e.localizedMessage)
@ -292,9 +293,10 @@ class ImportFragment(private val account: Account, private val uid: String, priv
provider?.let { provider?.let {
val localTaskList: LocalTaskList? val localTaskList: LocalTaskList?
try { try {
localTaskList = LocalTaskList.findByName(account, it, LocalTaskList.Factory, uid!!) localTaskList = LocalTaskList.findByName(account, it, LocalTaskList.Factory, uid)
if (localTaskList == null) { if (localTaskList == null) {
throw FileNotFoundException("Failed to load local resource.") result.e = FileNotFoundException("Failed to load local resource.")
return result
} }
} catch (e: FileNotFoundException) { } catch (e: FileNotFoundException) {
Logger.log.info("Fail" + e.localizedMessage) Logger.log.info("Fail" + e.localizedMessage)
@ -341,9 +343,10 @@ class ImportFragment(private val account: Account, private val uid: String, priv
return result return result
} }
val localAddressBook = LocalAddressBook.findByUid(context, provider, account, uid!!) val localAddressBook = LocalAddressBook.findByUid(context, provider, account, uid)
if (localAddressBook == null) { if (localAddressBook == null) {
throw FileNotFoundException("Failed to load local address book.") result.e = FileNotFoundException("Failed to load local address book.")
return result
} }
for (contact in contacts.filter { contact -> !contact.group }) { for (contact in contacts.filter { contact -> !contact.group }) {