Skip to content

Remove dead code for jCard contact processing #2079

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rfc2822 merged 3 commits into from
Mar 27, 2026
+3 −26
Merged

Remove dead code for jCard contact processing #2079

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6593be6
Remove jCard support due to server compatibility issues
rfc2822 Mar 16, 2026
0568d17
Add `jCard =` to call
rfc2822 Mar 16, 2026
686681b
Remove jCard support due to server compatibility issues
rfc2822 Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 2 additions & 20 deletions core/src/main/kotlin/at/bitfire/davdroid/sync/ContactsSyncManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ class ContactsSyncManager @AssistedInject constructor(
private val accountSettings = accountSettingsFactory.create(account)

private var hasVCard4 = false
private var hasJCard = false
private val groupStrategy = when (accountSettings.getGroupMethod()) {
GroupMethod.GROUP_VCARDS -> VCard4Strategy(localAddressBook)
GroupMethod.CATEGORIES -> CategoriesStrategy(localAddressBook)
Expand Down Expand Up @@ -183,9 +182,6 @@ class ContactsSyncManager @AssistedInject constructor(

response[SupportedAddressData::class.java]?.let { supported ->
hasVCard4 = supported.hasVCard4()

// temporarily disable jCard because of https://github.com/nextcloud/server/issues/29693
// hasJCard = supported.hasJCard()
}
response[SupportedReportSet::class.java]?.let { supported ->
hasCollectionSync = supported.reports.contains(WebDAV.SyncCollection)
Expand Down Expand Up @@ -294,10 +290,6 @@ class ContactsSyncManager @AssistedInject constructor(
val os = ByteArrayOutputStream()
val mimeType: MediaType
when {
hasJCard -> {
mimeType = DavAddressBook.MIME_JCARD
contact.writeJCard(os, productIds.vCardProdId)
}
hasVCard4 -> {
mimeType = DavAddressBook.MIME_VCARD4
contact.writeVCard(VCardVersion.V4_0, os, productIds.vCardProdId)
Expand Down Expand Up @@ -327,10 +319,6 @@ class ContactsSyncManager @AssistedInject constructor(
val contentType: String?
val version: String?
when {
hasJCard -> {
contentType = DavUtils.MEDIA_TYPE_JCARD.toString()
version = VCardVersion.V4_0.version
}
hasVCard4 -> {
contentType = DavUtils.MEDIA_TYPE_VCARD.toString()
version = VCardVersion.V4_0.version
Expand Down Expand Up @@ -358,16 +346,10 @@ class ContactsSyncManager @AssistedInject constructor(
val eTag = response[GetETag::class.java]?.eTag
?: throw DavException("Received multi-get response without ETag")

var isJCard = hasJCard // assume that server has sent what we have requested (we ask for jCard only when the server advertises it)
response[GetContentType::class.java]?.type?.toMediaTypeOrNull()?.let { type ->
isJCard = type.sameTypeAs(DavUtils.MEDIA_TYPE_JCARD)
}

processCard(
fileName = response.href.lastSegment,
eTag = eTag,
reader = StringReader(card),
jCard = isJCard,
downloader = object : Contact.Downloader {
override suspend fun download(url: String, accepts: String): ByteArray? {
// retrieve external resource (like a photo) from a URL (not necessarily HTTP[S])
Expand All @@ -389,12 +371,12 @@ class ContactsSyncManager @AssistedInject constructor(

// helpers

private fun processCard(fileName: String, eTag: String, reader: Reader, jCard: Boolean, downloader: Contact.Downloader) {
private fun processCard(fileName: String, eTag: String, reader: Reader, downloader: Contact.Downloader) {
logger.info("Processing CardDAV resource $fileName")

val contacts = try {
runBlocking(ioDispatcher) {
Contact.fromReader(reader, jCard, downloader)
Contact.fromReader(reader, jCard = false, downloader)
}
} catch (e: CannotParseException) {
logger.log(Level.SEVERE, "Received invalid vCard, ignoring", e)
Expand Down
1 change: 0 additions & 1 deletion core/src/main/kotlin/at/bitfire/davdroid/util/DavUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ object DavUtils {

const val MIME_TYPE_ACCEPT_ALL = "*/*"

val MEDIA_TYPE_JCARD = "application/vcard+json".toMediaType()
val MEDIA_TYPE_OCTET_STREAM = "application/octet-stream".toMediaType()
val MEDIA_TYPE_VCARD = "text/vcard".toMediaType()

Expand Down
Loading