arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-06-28 02:42:37 +00:00
Code Issues Releases Wiki Activity

Address book import: add support for importing groups from file

Browse Source 
Fixes #54
This commit is contained in:
Tom Hacohen 2019-01-12 12:06:08 +00:00
parent 0ae278aabd
commit f9fc14b0dd
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ import android.support.v4.app.DialogFragment
import at.bitfire.ical4android.CalendarStorageException import at.bitfire.ical4android.CalendarStorageException
import at.bitfire.ical4android.Event import at.bitfire.ical4android.Event
import at.bitfire.ical4android.InvalidCalendarException import at.bitfire.ical4android.InvalidCalendarException
import at.bitfire.vcard4android.BatchOperation
import at.bitfire.vcard4android.Contact import at.bitfire.vcard4android.Contact
import at.bitfire.vcard4android.ContactsStorageException import at.bitfire.vcard4android.ContactsStorageException
import com.etesync.syncadapter.App import com.etesync.syncadapter.App
@ -24,10 +25,7 @@ import com.etesync.syncadapter.Constants.KEY_ACCOUNT
import com.etesync.syncadapter.Constants.KEY_COLLECTION_INFO import com.etesync.syncadapter.Constants.KEY_COLLECTION_INFO
import com.etesync.syncadapter.R import com.etesync.syncadapter.R
import com.etesync.syncadapter.model.CollectionInfo import com.etesync.syncadapter.model.CollectionInfo
import com.etesync.syncadapter.resource.LocalAddressBook import com.etesync.syncadapter.resource.*
import com.etesync.syncadapter.resource.LocalCalendar
import com.etesync.syncadapter.resource.LocalContact
import com.etesync.syncadapter.resource.LocalEvent
import com.etesync.syncadapter.syncadapter.ContactsSyncManager import com.etesync.syncadapter.syncadapter.ContactsSyncManager
import com.etesync.syncadapter.ui.Refreshable import com.etesync.syncadapter.ui.Refreshable
import com.etesync.syncadapter.ui.importlocal.ResultFragment.ImportResult import com.etesync.syncadapter.ui.importlocal.ResultFragment.ImportResult
@ -248,7 +246,8 @@ class ImportFragment : DialogFragment() {
entryProcessed() entryProcessed()
} }
} else if (info.type == CollectionInfo.Type.ADDRESS_BOOK) { } else if (info.type == CollectionInfo.Type.ADDRESS_BOOK) {
// FIXME: Handle groups and download icon? // FIXME: assumes groups only show after their members
val oldUidToNewId = HashMap<String?, Long>()
val downloader = ContactsSyncManager.ResourceDownloader(context!!) val downloader = ContactsSyncManager.ResourceDownloader(context!!)
val contacts = Contact.fromReader(importReader, downloader) val contacts = Contact.fromReader(importReader, downloader)
@ -267,8 +266,26 @@ class ImportFragment : DialogFragment() {
for (contact in contacts) { for (contact in contacts) {
try { try {
val localContact = LocalContact(localAddressBook!!, contact, null, null) if (contact.group) {
localContact.createAsDirty() val localGroup = LocalGroup(localAddressBook!!, contact, null, null)
val memberIds = contact.members.map { memberUid ->
oldUidToNewId[memberUid]!!
}
localGroup.createAsDirty(memberIds)
} else {
val localContact = LocalContact(localAddressBook!!, contact, null, null)
localContact.createAsDirty()
// If uid is null, so be it. We won't be able to process the group later.
oldUidToNewId[contact.uid] = localContact.id!!
// Apply categories
val batch = BatchOperation(localAddressBook.provider!!)
for (category in contact.categories) {
localContact.addToGroup(batch, localAddressBook.findOrCreateGroup(category))
}
batch.commit()
}
result.added++ result.added++
} catch (e: ContactsStorageException) { } catch (e: ContactsStorageException) {
e.printStackTrace() e.printStackTrace()