arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-02-23 13:02:04 +00:00
Code Issues Releases Wiki Activity

Contacts import: show a sensible error when address book is not found.

Browse Source
This commit is contained in:
Tom Hacohen 2020-08-28 16:35:02 +03:00
parent 7ff80aaf9b
commit cccbfba568
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/etesync/syncadapter/ui/importlocal/LocalContactImportFragment.kt
View File

@ -22,8 +22,6 @@ import androidx.fragment.app.commit
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import at.bitfire.vcard4android.ContactsStorageException import at.bitfire.vcard4android.ContactsStorageException
import com.etesync.syncadapter.Constants.KEY_ACCOUNT
import com.etesync.syncadapter.Constants.KEY_COLLECTION_INFO
import com.etesync.syncadapter.R import com.etesync.syncadapter.R
import com.etesync.syncadapter.log.Logger import com.etesync.syncadapter.log.Logger
import com.etesync.syncadapter.model.CollectionInfo import com.etesync.syncadapter.model.CollectionInfo
@ -135,9 +133,10 @@ class LocalContactImportFragment(private val account: Account, private val uid:
private fun importContacts(localAddressBook: LocalAddressBook): ResultFragment.ImportResult { private fun importContacts(localAddressBook: LocalAddressBook): ResultFragment.ImportResult {
val result = ResultFragment.ImportResult() val result = ResultFragment.ImportResult()
try { try {
val addressBook = LocalAddressBook.findByUid(context!!, val addressBook = LocalAddressBook.findByUid(requireContext(),
context!!.contentResolver.acquireContentProviderClient(ContactsContract.RawContacts.CONTENT_URI)!!, requireContext().contentResolver.acquireContentProviderClient(ContactsContract.RawContacts.CONTENT_URI)!!,
account, uid)!! account, uid)
?: throw Exception("Could not find address book")
val localContacts = localAddressBook.findAllContacts() val localContacts = localAddressBook.findAllContacts()
val localGroups = localAddressBook.findAllGroups() val localGroups = localAddressBook.findAllGroups()
val oldIdToNewId = HashMap<Long, Long>() val oldIdToNewId = HashMap<Long, Long>()