fenix
/
Simple-Contacts
mirror of https://github.com/SimpleMobileTools/Simple-Contacts.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #247 from Dirkster99/master 

Solution to Issue #146
This commit is contained in:
Tibor Kaputa 2018-09-09 14:50:56 +02:00 committed by GitHub
parent 518d8491a6 6c1b1e2d70
commit b90405ceea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/kotlin/com/simplemobiletools/contacts/helpers/VcfExporter.kt
View File

@ -139,6 +139,15 @@ class VcfExporter {
card.addPhoto(photo) card.addPhoto(photo)
} }
if (contact.groups.size > 0) {
val groupList = Categories()
contact.groups.forEach {
groupList.values.add(it.title)
}
card.categories = groupList
}
cards.add(card) cards.add(card)
contactsExported++ contactsExported++
} }

26
app/src/main/kotlin/com/simplemobiletools/contacts/helpers/VcfImporter.kt
View File

@ -5,7 +5,9 @@ import android.graphics.BitmapFactory
import android.provider.ContactsContract.CommonDataKinds import android.provider.ContactsContract.CommonDataKinds
import android.widget.Toast import android.widget.Toast
import com.simplemobiletools.commons.extensions.showErrorToast import com.simplemobiletools.commons.extensions.showErrorToast
import com.simplemobiletools.contacts.R
import com.simplemobiletools.contacts.activities.SimpleActivity import com.simplemobiletools.contacts.activities.SimpleActivity
import com.simplemobiletools.contacts.extensions.dbHelper
import com.simplemobiletools.contacts.extensions.getCachePhoto import com.simplemobiletools.contacts.extensions.getCachePhoto
import com.simplemobiletools.contacts.extensions.getCachePhotoUri import com.simplemobiletools.contacts.extensions.getCachePhotoUri
import com.simplemobiletools.contacts.helpers.VcfImporter.ImportResult.* import com.simplemobiletools.contacts.helpers.VcfImporter.ImportResult.*
@ -103,6 +105,30 @@ class VcfImporter(val activity: SimpleActivity) {
val contactId = 0 val contactId = 0
val notes = ezContact.notes.firstOrNull()?.value ?: "" val notes = ezContact.notes.firstOrNull()?.value ?: ""
val groups = ArrayList<Group>() val groups = ArrayList<Group>()
if (ezContact.categories != null) {
val groupNames = ezContact.categories.values
if (groupNames != null) {
val storedGroups = ContactsHelper(activity).getStoredGroups()
groupNames.forEach {
val groupName = it
val storedGroup = storedGroups.firstOrNull { it.title == groupName }
if (storedGroup != null) {
groups.add(storedGroup)
}
else {
val newcontactGroup = activity.dbHelper.insertGroup(Group(0, groupName))
if (newcontactGroup != null)
groups.add(newcontactGroup)
}
}
}
}
val company = ezContact.organization?.values?.firstOrNull() ?: "" val company = ezContact.organization?.values?.firstOrNull() ?: ""
val jobPosition = ezContact.titles?.firstOrNull()?.value ?: "" val jobPosition = ezContact.titles?.firstOrNull()?.value ?: ""
val organization = Organization(company, jobPosition) val organization = Organization(company, jobPosition)