1
0
mirror of https://github.com/etesync/android synced 2025-06-29 19:32:41 +00:00

View Collection: add checks if we successfully managed to acquire the provider.

This commit is contained in:
Tom Hacohen 2019-03-07 08:09:16 +00:00
parent 0dc551c8b2
commit 332caf1631

View File

@ -188,8 +188,11 @@ class ViewCollectionActivity : BaseActivity(), Refreshable {
CollectionInfo.Type.CALENDAR -> { CollectionInfo.Type.CALENDAR -> {
try { try {
val providerClient = contentResolver.acquireContentProviderClient(CalendarContract.CONTENT_URI) val providerClient = contentResolver.acquireContentProviderClient(CalendarContract.CONTENT_URI)
if (providerClient == null) {
return null
}
val resource = LocalCalendar.findByName(account, providerClient, LocalCalendar.Factory, info.uid!!) val resource = LocalCalendar.findByName(account, providerClient, LocalCalendar.Factory, info.uid!!)
providerClient!!.release() providerClient.release()
if (resource == null) { if (resource == null) {
return null return null
} }
@ -203,7 +206,10 @@ class ViewCollectionActivity : BaseActivity(), Refreshable {
CollectionInfo.Type.TASKS -> { CollectionInfo.Type.TASKS -> {
try { try {
val providerClient = TaskProvider.acquire(this@ViewCollectionActivity, TaskProvider.ProviderName.OpenTasks) val providerClient = TaskProvider.acquire(this@ViewCollectionActivity, TaskProvider.ProviderName.OpenTasks)
val resource = LocalTaskList.findByName(account, providerClient!!, LocalTaskList.Factory, info.uid!!) if (providerClient == null) {
return null
}
val resource = LocalTaskList.findByName(account, providerClient, LocalTaskList.Factory, info.uid!!)
if (resource == null) { if (resource == null) {
return null return null
} }
@ -215,7 +221,10 @@ class ViewCollectionActivity : BaseActivity(), Refreshable {
CollectionInfo.Type.ADDRESS_BOOK -> { CollectionInfo.Type.ADDRESS_BOOK -> {
try { try {
val providerClient = contentResolver.acquireContentProviderClient(ContactsContract.Contacts.CONTENT_URI) val providerClient = contentResolver.acquireContentProviderClient(ContactsContract.Contacts.CONTENT_URI)
val resource = LocalAddressBook.findByUid(this@ViewCollectionActivity, providerClient!!, account, info.uid!!) if (providerClient == null) {
return null
}
val resource = LocalAddressBook.findByUid(this@ViewCollectionActivity, providerClient, account, info.uid!!)
providerClient.release() providerClient.release()
if (resource == null) { if (resource == null) {
return null return null