diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/TestUtils.kt b/lib/src/androidTest/kotlin/at/bitfire/synctools/mapping/contacts/TestUtils.kt similarity index 93% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/TestUtils.kt rename to lib/src/androidTest/kotlin/at/bitfire/synctools/mapping/contacts/TestUtils.kt index 537ee75ee..48d43a42f 100644 --- a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/TestUtils.kt +++ b/lib/src/androidTest/kotlin/at/bitfire/synctools/mapping/contacts/TestUtils.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android +package at.bitfire.synctools.mapping.contacts object TestUtils { @@ -16,4 +16,4 @@ object TestUtils { fun resourceToByteArray(resource: String): ByteArray = this::class.java.getResourceAsStream(resource)!!.use { it.readBytes() } -} +} \ No newline at end of file diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/PhotoBuilderTest.kt b/lib/src/androidTest/kotlin/at/bitfire/synctools/mapping/contacts/builder/PhotoBuilderTest.kt similarity index 90% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/PhotoBuilderTest.kt rename to lib/src/androidTest/kotlin/at/bitfire/synctools/mapping/contacts/builder/PhotoBuilderTest.kt index 31992f4a7..ac71a34f5 100644 --- a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/PhotoBuilderTest.kt +++ b/lib/src/androidTest/kotlin/at/bitfire/synctools/mapping/contacts/builder/PhotoBuilderTest.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.builder import android.Manifest import android.accounts.Account @@ -16,11 +16,14 @@ import android.provider.ContactsContract import android.provider.ContactsContract.RawContacts import androidx.test.platform.app.InstrumentationRegistry import androidx.test.rule.GrantPermissionRule -import at.bitfire.vcard4android.AndroidContact -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.TestUtils -import at.bitfire.vcard4android.impl.TestAddressBook -import org.junit.Assert.* +import at.bitfire.synctools.mapping.contacts.Contact +import at.bitfire.synctools.mapping.contacts.TestUtils +import at.bitfire.synctools.storage.contacts.AndroidContact +import at.bitfire.synctools.storage.contacts.TestAddressBook +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue import org.junit.BeforeClass import org.junit.ClassRule import org.junit.Test diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/PhotoHandlerTest.kt b/lib/src/androidTest/kotlin/at/bitfire/synctools/mapping/contacts/handler/PhotoHandlerTest.kt similarity index 87% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/PhotoHandlerTest.kt rename to lib/src/androidTest/kotlin/at/bitfire/synctools/mapping/contacts/handler/PhotoHandlerTest.kt index bc405114b..b31e8eceb 100644 --- a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/PhotoHandlerTest.kt +++ b/lib/src/androidTest/kotlin/at/bitfire/synctools/mapping/contacts/handler/PhotoHandlerTest.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.handler import android.Manifest import android.accounts.Account @@ -16,16 +16,22 @@ import android.provider.ContactsContract.CommonDataKinds.Photo import android.provider.ContactsContract.RawContacts import androidx.test.platform.app.InstrumentationRegistry import androidx.test.rule.GrantPermissionRule -import at.bitfire.vcard4android.AndroidContact -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.TestUtils -import at.bitfire.vcard4android.impl.TestAddressBook +import at.bitfire.synctools.mapping.contacts.Contact +import at.bitfire.synctools.mapping.contacts.TestUtils +import at.bitfire.synctools.storage.contacts.AndroidContact +import at.bitfire.synctools.storage.contacts.TestAddressBook import org.junit.Assert -import org.junit.Assert.* +import org.junit.Assert.assertArrayEquals +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNotEquals +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue import org.junit.BeforeClass import org.junit.ClassRule import org.junit.Test -import java.util.* +import java.util.Arrays class PhotoHandlerTest { diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/AndroidAddressBookTest.kt b/lib/src/androidTest/kotlin/at/bitfire/synctools/storage/contacts/AndroidAddressBookTest.kt similarity index 98% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/AndroidAddressBookTest.kt rename to lib/src/androidTest/kotlin/at/bitfire/synctools/storage/contacts/AndroidAddressBookTest.kt index 4ca8edb96..7f082b69b 100644 --- a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/AndroidAddressBookTest.kt +++ b/lib/src/androidTest/kotlin/at/bitfire/synctools/storage/contacts/AndroidAddressBookTest.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android +package at.bitfire.synctools.storage.contacts import android.Manifest import android.accounts.Account @@ -13,7 +13,7 @@ import android.content.ContentValues import android.provider.ContactsContract import androidx.test.platform.app.InstrumentationRegistry import androidx.test.rule.GrantPermissionRule -import at.bitfire.vcard4android.impl.TestAddressBook +import at.bitfire.synctools.mapping.contacts.Contact import org.junit.Assert.assertArrayEquals import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/AndroidContactTest.kt b/lib/src/androidTest/kotlin/at/bitfire/synctools/storage/contacts/AndroidContactTest.kt similarity index 97% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/AndroidContactTest.kt rename to lib/src/androidTest/kotlin/at/bitfire/synctools/storage/contacts/AndroidContactTest.kt index bdcd6f461..15387dfd3 100644 --- a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/AndroidContactTest.kt +++ b/lib/src/androidTest/kotlin/at/bitfire/synctools/storage/contacts/AndroidContactTest.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android +package at.bitfire.synctools.storage.contacts import android.Manifest import android.accounts.Account @@ -14,10 +14,10 @@ import android.util.Base64 import androidx.test.filters.MediumTest import androidx.test.platform.app.InstrumentationRegistry import androidx.test.rule.GrantPermissionRule +import at.bitfire.synctools.mapping.contacts.Contact +import at.bitfire.synctools.mapping.contacts.LabeledProperty import at.bitfire.synctools.storage.LocalStorageException -import at.bitfire.vcard4android.impl.TestAddressBook -import at.bitfire.vcard4android.impl.testProductId -import at.bitfire.vcard4android.property.XAbDate +import at.bitfire.synctools.vcard.property.XAbDate import ezvcard.VCardVersion import ezvcard.property.Address import ezvcard.property.Birthday diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/AndroidGroupTest.kt b/lib/src/androidTest/kotlin/at/bitfire/synctools/storage/contacts/AndroidGroupTest.kt similarity index 97% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/AndroidGroupTest.kt rename to lib/src/androidTest/kotlin/at/bitfire/synctools/storage/contacts/AndroidGroupTest.kt index 06b4186a3..a8ec99718 100644 --- a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/AndroidGroupTest.kt +++ b/lib/src/androidTest/kotlin/at/bitfire/synctools/storage/contacts/AndroidGroupTest.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android +package at.bitfire.synctools.storage.contacts import android.Manifest import android.accounts.Account @@ -12,7 +12,7 @@ import android.content.ContentProviderClient import android.provider.ContactsContract import androidx.test.platform.app.InstrumentationRegistry import androidx.test.rule.GrantPermissionRule -import at.bitfire.vcard4android.impl.TestAddressBook +import at.bitfire.synctools.mapping.contacts.Contact import org.junit.After import org.junit.Assert.assertEquals import org.junit.Assert.assertNotNull diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/impl/Constants.kt b/lib/src/androidTest/kotlin/at/bitfire/synctools/storage/contacts/Constants.kt similarity index 85% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/impl/Constants.kt rename to lib/src/androidTest/kotlin/at/bitfire/synctools/storage/contacts/Constants.kt index 0b881e448..8c944df61 100644 --- a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/impl/Constants.kt +++ b/lib/src/androidTest/kotlin/at/bitfire/synctools/storage/contacts/Constants.kt @@ -4,6 +4,6 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.impl +package at.bitfire.synctools.storage.contacts val testProductId = "bitfireAT/synctools test" \ No newline at end of file diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/impl/TestAddressBook.kt b/lib/src/androidTest/kotlin/at/bitfire/synctools/storage/contacts/TestAddressBook.kt similarity index 86% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/impl/TestAddressBook.kt rename to lib/src/androidTest/kotlin/at/bitfire/synctools/storage/contacts/TestAddressBook.kt index 69927f2c4..544a4184b 100644 --- a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/impl/TestAddressBook.kt +++ b/lib/src/androidTest/kotlin/at/bitfire/synctools/storage/contacts/TestAddressBook.kt @@ -4,16 +4,15 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.impl +package at.bitfire.synctools.storage.contacts import android.accounts.Account import android.content.ContentProviderClient import android.content.ContentValues -import at.bitfire.vcard4android.* class TestAddressBook( - account: Account, - provider: ContentProviderClient + account: Account, + provider: ContentProviderClient ): AndroidAddressBook(account, provider, ContactFactory, GroupFactory) { object ContactFactory: AndroidContactFactory { @@ -30,5 +29,5 @@ class TestAddressBook( AndroidGroup(addressBook, values) } - + } \ No newline at end of file diff --git a/lib/src/androidTest/kotlin/at/bitfire/synctools/util/UtilsTest.kt b/lib/src/androidTest/kotlin/at/bitfire/synctools/util/UtilsTest.kt new file mode 100644 index 000000000..96d5b21ef --- /dev/null +++ b/lib/src/androidTest/kotlin/at/bitfire/synctools/util/UtilsTest.kt @@ -0,0 +1,30 @@ +/* + * This file is part of bitfireAT/synctools which is released under GPLv3. + * Copyright © All Contributors. See the LICENSE and AUTHOR files in the root directory for details. + * SPDX-License-Identifier: GPL-3.0-or-later + */ + +package at.bitfire.synctools.util + +import at.bitfire.synctools.util.Utils.capitalize +import at.bitfire.synctools.util.Utils.trimToNull +import org.junit.Assert +import org.junit.Test + +class UtilsTest { + @Test + fun testCapitalize() { + Assert.assertEquals("Utils Test", "utils test".capitalize()) // Test multiple words + Assert.assertEquals("Utils", "utils".capitalize()) // Test single word + Assert.assertEquals("", "".capitalize()) // Test empty string + } + + @Test + fun testTrimToNull() { + Assert.assertEquals("test", " test".trimToNull()) // Test spaces only before + Assert.assertEquals("test", "test ".trimToNull()) // Test spaces only after + Assert.assertEquals("test", " test ".trimToNull()) // Test spaces before and after + Assert.assertNull(" ".trimToNull()) // Test spaces + Assert.assertNull("".trimToNull()) // Test empty string + } +} \ No newline at end of file diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/LocaleNonWesternDigitsTest.kt b/lib/src/androidTest/kotlin/at/bitfire/synctools/vcard/LocaleNonWesternDigitsTest.kt similarity index 98% rename from lib/src/test/kotlin/at/bitfire/vcard4android/LocaleNonWesternDigitsTest.kt rename to lib/src/androidTest/kotlin/at/bitfire/synctools/vcard/LocaleNonWesternDigitsTest.kt index b521a07e4..3879fd9a3 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/LocaleNonWesternDigitsTest.kt +++ b/lib/src/androidTest/kotlin/at/bitfire/synctools/vcard/LocaleNonWesternDigitsTest.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android +package at.bitfire.synctools.vcard import ezvcard.Ezvcard import ezvcard.VCard diff --git a/lib/src/main/kotlin/at/bitfire/synctools/icalendar/ICalendarGenerator.kt b/lib/src/main/kotlin/at/bitfire/synctools/icalendar/ICalendarGenerator.kt index c983304ce..094669a5b 100644 --- a/lib/src/main/kotlin/at/bitfire/synctools/icalendar/ICalendarGenerator.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/icalendar/ICalendarGenerator.kt @@ -7,7 +7,7 @@ package at.bitfire.synctools.icalendar import androidx.annotation.VisibleForTesting -import at.bitfire.vcard4android.Utils.trimToNull +import at.bitfire.synctools.util.Utils.trimToNull import net.fortuna.ical4j.data.CalendarOutputter import net.fortuna.ical4j.model.Calendar import net.fortuna.ical4j.model.Component diff --git a/lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/builder/DescriptionBuilder.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/builder/DescriptionBuilder.kt index 2a407e3fc..fe623949f 100644 --- a/lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/builder/DescriptionBuilder.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/builder/DescriptionBuilder.kt @@ -8,7 +8,7 @@ package at.bitfire.synctools.mapping.calendar.builder import android.content.Entity import android.provider.CalendarContract.Events -import at.bitfire.vcard4android.Utils.trimToNull +import at.bitfire.synctools.util.Utils.trimToNull import net.fortuna.ical4j.model.component.VEvent class DescriptionBuilder: AndroidEntityBuilder { diff --git a/lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/builder/LocationBuilder.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/builder/LocationBuilder.kt index 24dfe2cf7..7d67a01b9 100644 --- a/lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/builder/LocationBuilder.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/builder/LocationBuilder.kt @@ -8,7 +8,7 @@ package at.bitfire.synctools.mapping.calendar.builder import android.content.Entity import android.provider.CalendarContract.Events -import at.bitfire.vcard4android.Utils.trimToNull +import at.bitfire.synctools.util.Utils.trimToNull import net.fortuna.ical4j.model.component.VEvent class LocationBuilder: AndroidEntityBuilder { diff --git a/lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/builder/TitleBuilder.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/builder/TitleBuilder.kt index ad95e2b2f..6516c64d3 100644 --- a/lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/builder/TitleBuilder.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/builder/TitleBuilder.kt @@ -8,7 +8,7 @@ package at.bitfire.synctools.mapping.calendar.builder import android.content.Entity import android.provider.CalendarContract.Events -import at.bitfire.vcard4android.Utils.trimToNull +import at.bitfire.synctools.util.Utils.trimToNull import net.fortuna.ical4j.model.component.VEvent class TitleBuilder: AndroidEntityBuilder { diff --git a/lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/handler/DescriptionHandler.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/handler/DescriptionHandler.kt index f04ff7231..fb5d619c7 100644 --- a/lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/handler/DescriptionHandler.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/handler/DescriptionHandler.kt @@ -9,7 +9,7 @@ package at.bitfire.synctools.mapping.calendar.handler import android.content.Entity import android.provider.CalendarContract.Events import at.bitfire.synctools.icalendar.plusAssign -import at.bitfire.vcard4android.Utils.trimToNull +import at.bitfire.synctools.util.Utils.trimToNull import net.fortuna.ical4j.model.component.VEvent import net.fortuna.ical4j.model.property.Description diff --git a/lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/handler/LocationHandler.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/handler/LocationHandler.kt index 7645d42bc..ee84228f3 100644 --- a/lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/handler/LocationHandler.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/handler/LocationHandler.kt @@ -9,7 +9,7 @@ package at.bitfire.synctools.mapping.calendar.handler import android.content.Entity import android.provider.CalendarContract.Events import at.bitfire.synctools.icalendar.plusAssign -import at.bitfire.vcard4android.Utils.trimToNull +import at.bitfire.synctools.util.Utils.trimToNull import net.fortuna.ical4j.model.component.VEvent import net.fortuna.ical4j.model.property.Location diff --git a/lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/handler/TitleHandler.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/handler/TitleHandler.kt index 546d56f55..b33ec0e7d 100644 --- a/lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/handler/TitleHandler.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/handler/TitleHandler.kt @@ -9,7 +9,7 @@ package at.bitfire.synctools.mapping.calendar.handler import android.content.Entity import android.provider.CalendarContract.Events import at.bitfire.synctools.icalendar.plusAssign -import at.bitfire.vcard4android.Utils.trimToNull +import at.bitfire.synctools.util.Utils.trimToNull import net.fortuna.ical4j.model.component.VEvent import net.fortuna.ical4j.model.property.Summary diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/Contact.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/Contact.kt similarity index 96% rename from lib/src/main/kotlin/at/bitfire/vcard4android/Contact.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/Contact.kt index 49236dabb..d1d1aabf2 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/Contact.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/Contact.kt @@ -4,10 +4,10 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android +package at.bitfire.synctools.mapping.contacts -import at.bitfire.vcard4android.property.CustomScribes.registerCustomScribes -import at.bitfire.vcard4android.property.XAbDate +import at.bitfire.synctools.vcard.property.CustomScribes.registerCustomScribes +import at.bitfire.synctools.vcard.property.XAbDate import com.google.common.base.Ascii import com.google.common.base.MoreObjects import ezvcard.VCardVersion @@ -37,7 +37,7 @@ import java.util.LinkedList * vCards are parsed to [Contact]s by [ContactReader]. * [Contact]s are written to vCards by [ContactWriter]. * - * [Contact]s are written to and read from the Android storage by [AndroidContact]. + * [Contact]s are written to and read from the Android storage by [at.bitfire.synctools.storage.contacts.AndroidContact]. */ data class Contact( var uid: String? = null, diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/ContactProcessor.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/ContactProcessor.kt similarity index 59% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/ContactProcessor.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/ContactProcessor.kt index 761dc5f56..c890d21d1 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/ContactProcessor.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/ContactProcessor.kt @@ -4,15 +4,41 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts import android.content.ContentProviderClient import android.content.ContentValues import android.net.Uri import android.provider.ContactsContract.RawContacts -import at.bitfire.synctools.storage.ContactsBatchOperation -import at.bitfire.vcard4android.AndroidContact -import at.bitfire.vcard4android.Contact +import at.bitfire.synctools.mapping.contacts.builder.DataRowBuilder +import at.bitfire.synctools.mapping.contacts.builder.EmailBuilder +import at.bitfire.synctools.mapping.contacts.builder.EventBuilder +import at.bitfire.synctools.mapping.contacts.builder.ImBuilder +import at.bitfire.synctools.mapping.contacts.builder.NicknameBuilder +import at.bitfire.synctools.mapping.contacts.builder.NoteBuilder +import at.bitfire.synctools.mapping.contacts.builder.OrganizationBuilder +import at.bitfire.synctools.mapping.contacts.builder.PhoneBuilder +import at.bitfire.synctools.mapping.contacts.builder.PhotoBuilder +import at.bitfire.synctools.mapping.contacts.builder.RelationBuilder +import at.bitfire.synctools.mapping.contacts.builder.SipAddressBuilder +import at.bitfire.synctools.mapping.contacts.builder.StructuredNameBuilder +import at.bitfire.synctools.mapping.contacts.builder.StructuredPostalBuilder +import at.bitfire.synctools.mapping.contacts.builder.WebsiteBuilder +import at.bitfire.synctools.mapping.contacts.handler.DataRowHandler +import at.bitfire.synctools.mapping.contacts.handler.EmailHandler +import at.bitfire.synctools.mapping.contacts.handler.EventHandler +import at.bitfire.synctools.mapping.contacts.handler.ImHandler +import at.bitfire.synctools.mapping.contacts.handler.NicknameHandler +import at.bitfire.synctools.mapping.contacts.handler.NoteHandler +import at.bitfire.synctools.mapping.contacts.handler.OrganizationHandler +import at.bitfire.synctools.mapping.contacts.handler.PhoneHandler +import at.bitfire.synctools.mapping.contacts.handler.PhotoHandler +import at.bitfire.synctools.mapping.contacts.handler.RelationHandler +import at.bitfire.synctools.mapping.contacts.handler.SipAddressHandler +import at.bitfire.synctools.mapping.contacts.handler.StructuredNameHandler +import at.bitfire.synctools.mapping.contacts.handler.StructuredPostalHandler +import at.bitfire.synctools.mapping.contacts.handler.WebsiteHandler +import at.bitfire.synctools.storage.contacts.ContactsBatchOperation import java.util.logging.Level import java.util.logging.Logger @@ -77,7 +103,7 @@ class ContactProcessor( fun handleRawContact(values: ContentValues, contact: Contact) { - contact.uid = values.getAsString(AndroidContact.COLUMN_UID) + contact.uid = values.getAsString(at.bitfire.synctools.storage.contacts.AndroidContact.COLUMN_UID) } fun handleDataRow(values: ContentValues, contact: Contact) { @@ -109,4 +135,4 @@ class ContactProcessor( return mimeTypes } -} \ No newline at end of file +} diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/ContactReader.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/ContactReader.kt similarity index 96% rename from lib/src/main/kotlin/at/bitfire/vcard4android/ContactReader.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/ContactReader.kt index 3441392bf..7a8446461 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/ContactReader.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/ContactReader.kt @@ -4,18 +4,18 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android - -import at.bitfire.vcard4android.Utils.trimToNull -import at.bitfire.vcard4android.property.CustomScribes.registerCustomScribes -import at.bitfire.vcard4android.property.CustomType -import at.bitfire.vcard4android.property.XAbDate -import at.bitfire.vcard4android.property.XAbLabel -import at.bitfire.vcard4android.property.XAbRelatedNames -import at.bitfire.vcard4android.property.XPhoneticFirstName -import at.bitfire.vcard4android.property.XPhoneticLastName -import at.bitfire.vcard4android.property.XPhoneticMiddleName -import at.bitfire.vcard4android.property.XSip +package at.bitfire.synctools.mapping.contacts + +import at.bitfire.synctools.util.Utils.trimToNull +import at.bitfire.synctools.vcard.property.CustomScribes.registerCustomScribes +import at.bitfire.synctools.vcard.property.CustomType +import at.bitfire.synctools.vcard.property.XAbDate +import at.bitfire.synctools.vcard.property.XAbLabel +import at.bitfire.synctools.vcard.property.XAbRelatedNames +import at.bitfire.synctools.vcard.property.XPhoneticFirstName +import at.bitfire.synctools.vcard.property.XPhoneticLastName +import at.bitfire.synctools.vcard.property.XPhoneticMiddleName +import at.bitfire.synctools.vcard.property.XSip import ezvcard.Ezvcard import ezvcard.VCard import ezvcard.parameter.RelatedType diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/ContactWriter.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/ContactWriter.kt similarity index 94% rename from lib/src/main/kotlin/at/bitfire/vcard4android/ContactWriter.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/ContactWriter.kt index 42e5c1815..a5bffb53f 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/ContactWriter.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/ContactWriter.kt @@ -4,21 +4,21 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android - -import at.bitfire.vcard4android.Utils.capitalize -import at.bitfire.vcard4android.Utils.isEmpty -import at.bitfire.vcard4android.Utils.trimToNull -import at.bitfire.vcard4android.property.CustomScribes.registerCustomScribes -import at.bitfire.vcard4android.property.CustomType -import at.bitfire.vcard4android.property.XAbDate -import at.bitfire.vcard4android.property.XAbLabel -import at.bitfire.vcard4android.property.XAbRelatedNames -import at.bitfire.vcard4android.property.XAddressBookServerKind -import at.bitfire.vcard4android.property.XAddressBookServerMember -import at.bitfire.vcard4android.property.XPhoneticFirstName -import at.bitfire.vcard4android.property.XPhoneticLastName -import at.bitfire.vcard4android.property.XPhoneticMiddleName +package at.bitfire.synctools.mapping.contacts + +import at.bitfire.synctools.util.Utils.capitalize +import at.bitfire.synctools.util.Utils.isEmpty +import at.bitfire.synctools.util.Utils.trimToNull +import at.bitfire.synctools.vcard.property.CustomScribes.registerCustomScribes +import at.bitfire.synctools.vcard.property.CustomType +import at.bitfire.synctools.vcard.property.XAbDate +import at.bitfire.synctools.vcard.property.XAbLabel +import at.bitfire.synctools.vcard.property.XAbRelatedNames +import at.bitfire.synctools.vcard.property.XAddressBookServerKind +import at.bitfire.synctools.vcard.property.XAddressBookServerMember +import at.bitfire.synctools.vcard.property.XPhoneticFirstName +import at.bitfire.synctools.vcard.property.XPhoneticLastName +import at.bitfire.synctools.vcard.property.XPhoneticMiddleName import ezvcard.Ezvcard import ezvcard.VCard import ezvcard.VCardVersion diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/LabeledProperty.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/LabeledProperty.kt similarity index 89% rename from lib/src/main/kotlin/at/bitfire/vcard4android/LabeledProperty.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/LabeledProperty.kt index 807a46858..bd2701fda 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/LabeledProperty.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/LabeledProperty.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android +package at.bitfire.synctools.mapping.contacts import ezvcard.property.VCardProperty diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/DataRowBuilder.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/DataRowBuilder.kt similarity index 95% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/DataRowBuilder.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/DataRowBuilder.kt index 7fdb2d279..c597781da 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/DataRowBuilder.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/DataRowBuilder.kt @@ -4,12 +4,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.builder import android.net.Uri import android.provider.ContactsContract +import at.bitfire.synctools.mapping.contacts.Contact import at.bitfire.synctools.storage.BatchOperation -import at.bitfire.vcard4android.Contact import java.util.logging.Logger /** diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/EmailBuilder.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/EmailBuilder.kt similarity index 94% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/EmailBuilder.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/EmailBuilder.kt index 39fd5cffa..9cb7d7d0f 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/EmailBuilder.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/EmailBuilder.kt @@ -4,14 +4,14 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.builder import android.net.Uri import android.provider.ContactsContract import android.provider.ContactsContract.CommonDataKinds.Email +import at.bitfire.synctools.mapping.contacts.Contact import at.bitfire.synctools.storage.BatchOperation -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.property.CustomType +import at.bitfire.synctools.vcard.property.CustomType import ezvcard.parameter.EmailType import java.util.LinkedList import java.util.logging.Level diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/EventBuilder.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/EventBuilder.kt similarity index 98% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/EventBuilder.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/EventBuilder.kt index ad15467b8..f26caeef8 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/EventBuilder.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/EventBuilder.kt @@ -4,12 +4,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.builder import android.net.Uri import android.provider.ContactsContract.CommonDataKinds.Event +import at.bitfire.synctools.mapping.contacts.Contact import at.bitfire.synctools.storage.BatchOperation -import at.bitfire.vcard4android.Contact import ezvcard.property.DateOrTimeProperty import ezvcard.util.PartialDate import java.time.Instant diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/ImBuilder.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/ImBuilder.kt similarity index 95% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/ImBuilder.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/ImBuilder.kt index 891f2e253..f0b8d50f1 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/ImBuilder.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/ImBuilder.kt @@ -4,12 +4,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.builder import android.net.Uri import android.provider.ContactsContract.CommonDataKinds.Im +import at.bitfire.synctools.mapping.contacts.Contact import at.bitfire.synctools.storage.BatchOperation -import at.bitfire.vcard4android.Contact import ezvcard.parameter.ImppType import java.util.LinkedList diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/NicknameBuilder.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/NicknameBuilder.kt similarity index 93% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/NicknameBuilder.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/NicknameBuilder.kt index 592780e30..18a14f502 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/NicknameBuilder.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/NicknameBuilder.kt @@ -4,13 +4,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.builder import android.net.Uri import android.provider.ContactsContract.CommonDataKinds +import at.bitfire.synctools.mapping.contacts.Contact import at.bitfire.synctools.storage.BatchOperation -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.property.CustomType +import at.bitfire.synctools.vcard.property.CustomType import java.util.LinkedList class NicknameBuilder(dataRowUri: Uri, rawContactId: Long?, contact: Contact, readOnly: Boolean) diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/NoteBuilder.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/NoteBuilder.kt similarity index 91% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/NoteBuilder.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/NoteBuilder.kt index 0d6cf6131..94947c010 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/NoteBuilder.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/NoteBuilder.kt @@ -4,12 +4,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.builder import android.net.Uri import android.provider.ContactsContract.CommonDataKinds.Note +import at.bitfire.synctools.mapping.contacts.Contact import at.bitfire.synctools.storage.BatchOperation -import at.bitfire.vcard4android.Contact class NoteBuilder(dataRowUri: Uri, rawContactId: Long?, contact: Contact, readOnly: Boolean) : DataRowBuilder(Factory.mimeType(), dataRowUri, rawContactId, contact, readOnly) { diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/OrganizationBuilder.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/OrganizationBuilder.kt similarity index 92% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/OrganizationBuilder.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/OrganizationBuilder.kt index b39145907..2c59e3248 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/OrganizationBuilder.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/OrganizationBuilder.kt @@ -4,13 +4,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.builder import android.net.Uri import android.provider.ContactsContract.CommonDataKinds.Organization +import at.bitfire.synctools.mapping.contacts.Contact import at.bitfire.synctools.storage.BatchOperation -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.Utils.trimToNull +import at.bitfire.synctools.util.Utils.trimToNull import java.util.LinkedList class OrganizationBuilder(dataRowUri: Uri, rawContactId: Long?, contact: Contact, readOnly: Boolean) diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/PhoneBuilder.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/PhoneBuilder.kt similarity index 96% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/PhoneBuilder.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/PhoneBuilder.kt index 92e2a318b..199a5ec70 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/PhoneBuilder.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/PhoneBuilder.kt @@ -4,13 +4,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.builder import android.net.Uri import android.provider.ContactsContract.CommonDataKinds.Phone +import at.bitfire.synctools.mapping.contacts.Contact import at.bitfire.synctools.storage.BatchOperation -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.property.CustomType +import at.bitfire.synctools.vcard.property.CustomType import ezvcard.parameter.TelephoneType import java.util.LinkedList import java.util.logging.Level diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/PhotoBuilder.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/PhotoBuilder.kt similarity index 97% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/PhotoBuilder.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/PhotoBuilder.kt index eabf81cdc..20a1ea477 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/PhotoBuilder.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/PhotoBuilder.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.builder import android.accounts.Account import android.content.ContentProviderClient @@ -14,9 +14,9 @@ import android.graphics.BitmapFactory import android.net.Uri import android.provider.ContactsContract.CommonDataKinds.Photo import android.provider.ContactsContract.RawContacts +import at.bitfire.synctools.mapping.contacts.Contact import at.bitfire.synctools.storage.BatchOperation -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.Utils.asSyncAdapter +import at.bitfire.synctools.util.Utils.asSyncAdapter import java.io.IOException import java.util.logging.Level import java.util.logging.Logger diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/RelationBuilder.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/RelationBuilder.kt similarity index 92% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/RelationBuilder.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/RelationBuilder.kt index ae0817cb9..e01f8050b 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/RelationBuilder.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/RelationBuilder.kt @@ -4,15 +4,15 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.builder import android.net.Uri import android.provider.ContactsContract.CommonDataKinds.Relation +import at.bitfire.synctools.mapping.contacts.Contact import at.bitfire.synctools.storage.BatchOperation -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.Utils.capitalize -import at.bitfire.vcard4android.Utils.trimToNull -import at.bitfire.vcard4android.property.CustomType +import at.bitfire.synctools.util.Utils.capitalize +import at.bitfire.synctools.util.Utils.trimToNull +import at.bitfire.synctools.vcard.property.CustomType import ezvcard.parameter.RelatedType import java.util.LinkedList diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/SipAddressBuilder.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/SipAddressBuilder.kt similarity index 95% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/SipAddressBuilder.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/SipAddressBuilder.kt index 82ac709cc..678d9c087 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/SipAddressBuilder.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/SipAddressBuilder.kt @@ -4,12 +4,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.builder import android.net.Uri import android.provider.ContactsContract.CommonDataKinds.SipAddress +import at.bitfire.synctools.mapping.contacts.Contact import at.bitfire.synctools.storage.BatchOperation -import at.bitfire.vcard4android.Contact import ezvcard.parameter.ImppType import java.util.LinkedList diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameBuilder.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/StructuredNameBuilder.kt similarity index 96% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameBuilder.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/StructuredNameBuilder.kt index 3bf331397..d923f49e3 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameBuilder.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/StructuredNameBuilder.kt @@ -4,12 +4,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.builder import android.net.Uri import android.provider.ContactsContract.CommonDataKinds.StructuredName +import at.bitfire.synctools.mapping.contacts.Contact import at.bitfire.synctools.storage.BatchOperation -import at.bitfire.vcard4android.Contact class StructuredNameBuilder(dataRowUri: Uri, rawContactId: Long?, contact: Contact, readOnly: Boolean) : DataRowBuilder(Factory.mimeType(), dataRowUri, rawContactId, contact, readOnly) { diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalBuilder.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/StructuredPostalBuilder.kt similarity index 96% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalBuilder.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/StructuredPostalBuilder.kt index e6f40dcad..0959dd691 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalBuilder.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/StructuredPostalBuilder.kt @@ -4,13 +4,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.builder import android.net.Uri import android.provider.ContactsContract.CommonDataKinds.StructuredPostal +import at.bitfire.synctools.mapping.contacts.Contact import at.bitfire.synctools.storage.BatchOperation -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.Utils.trimToNull +import at.bitfire.synctools.util.Utils.trimToNull import ezvcard.parameter.AddressType import java.util.LinkedList diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/WebsiteBuilder.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/WebsiteBuilder.kt similarity index 93% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/WebsiteBuilder.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/WebsiteBuilder.kt index 34badec71..b8d342d18 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/WebsiteBuilder.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/builder/WebsiteBuilder.kt @@ -4,13 +4,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.builder import android.net.Uri import android.provider.ContactsContract.CommonDataKinds.Website +import at.bitfire.synctools.mapping.contacts.Contact import at.bitfire.synctools.storage.BatchOperation -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.property.CustomType +import at.bitfire.synctools.vcard.property.CustomType import java.util.LinkedList class WebsiteBuilder(dataRowUri: Uri, rawContactId: Long?, contact: Contact, readOnly: Boolean) diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/DataRowHandler.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/DataRowHandler.kt similarity index 90% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/DataRowHandler.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/DataRowHandler.kt index 0c86d7e9a..138769244 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/DataRowHandler.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/DataRowHandler.kt @@ -4,11 +4,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.handler import android.content.ContentValues import androidx.annotation.CallSuper -import at.bitfire.vcard4android.Contact +import at.bitfire.synctools.mapping.contacts.Contact import java.util.logging.Logger /** diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/EmailHandler.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/EmailHandler.kt similarity index 85% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/EmailHandler.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/EmailHandler.kt index 76e620287..e4b2fcf45 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/EmailHandler.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/EmailHandler.kt @@ -4,13 +4,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.handler import android.content.ContentValues import android.provider.ContactsContract.CommonDataKinds.Email -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.LabeledProperty -import at.bitfire.vcard4android.property.CustomType +import at.bitfire.synctools.mapping.contacts.Contact +import at.bitfire.synctools.mapping.contacts.LabeledProperty +import at.bitfire.synctools.vcard.property.CustomType import ezvcard.parameter.EmailType object EmailHandler: DataRowHandler() { diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/EventHandler.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/EventHandler.kt similarity index 93% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/EventHandler.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/EventHandler.kt index b7406b6fa..aabaca1c0 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/EventHandler.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/EventHandler.kt @@ -4,17 +4,17 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.handler import android.content.ContentValues import android.provider.ContactsContract.CommonDataKinds.Event import androidx.annotation.VisibleForTesting -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.LabeledProperty -import at.bitfire.vcard4android.Utils.trimToNull -import at.bitfire.vcard4android.contactrow.EventHandler.fullDateFormat -import at.bitfire.vcard4android.contactrow.EventHandler.fullDateTimeFormats -import at.bitfire.vcard4android.property.XAbDate +import at.bitfire.synctools.mapping.contacts.Contact +import at.bitfire.synctools.mapping.contacts.LabeledProperty +import at.bitfire.synctools.mapping.contacts.handler.EventHandler.fullDateFormat +import at.bitfire.synctools.mapping.contacts.handler.EventHandler.fullDateTimeFormats +import at.bitfire.synctools.util.Utils.trimToNull +import at.bitfire.synctools.vcard.property.XAbDate import ezvcard.property.Anniversary import ezvcard.property.Birthday import ezvcard.util.PartialDate diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/ImHandler.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/ImHandler.kt similarity index 94% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/ImHandler.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/ImHandler.kt index 53a72aa83..dd42f154a 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/ImHandler.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/ImHandler.kt @@ -4,12 +4,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.handler import android.content.ContentValues import android.provider.ContactsContract.CommonDataKinds.Im -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.LabeledProperty +import at.bitfire.synctools.mapping.contacts.Contact +import at.bitfire.synctools.mapping.contacts.LabeledProperty import ezvcard.parameter.ImppType import ezvcard.property.Impp diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/NicknameHandler.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/NicknameHandler.kt similarity index 85% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/NicknameHandler.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/NicknameHandler.kt index a86faed8a..da8c4d7ad 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/NicknameHandler.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/NicknameHandler.kt @@ -4,13 +4,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.handler import android.content.ContentValues import android.provider.ContactsContract.CommonDataKinds.Nickname -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.LabeledProperty -import at.bitfire.vcard4android.property.CustomType +import at.bitfire.synctools.mapping.contacts.Contact +import at.bitfire.synctools.mapping.contacts.LabeledProperty +import at.bitfire.synctools.vcard.property.CustomType object NicknameHandler: DataRowHandler() { diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/NoteHandler.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/NoteHandler.kt similarity index 84% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/NoteHandler.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/NoteHandler.kt index 7b9a7d48a..2164c3a20 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/NoteHandler.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/NoteHandler.kt @@ -4,11 +4,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.handler import android.content.ContentValues import android.provider.ContactsContract.CommonDataKinds.Note -import at.bitfire.vcard4android.Contact +import at.bitfire.synctools.mapping.contacts.Contact object NoteHandler: DataRowHandler() { diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/OrganizationHandler.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/OrganizationHandler.kt similarity index 91% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/OrganizationHandler.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/OrganizationHandler.kt index 944dda202..de35ca15b 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/OrganizationHandler.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/OrganizationHandler.kt @@ -4,11 +4,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.handler import android.content.ContentValues import android.provider.ContactsContract.CommonDataKinds.Organization -import at.bitfire.vcard4android.Contact +import at.bitfire.synctools.mapping.contacts.Contact object OrganizationHandler: DataRowHandler() { diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/PhoneHandler.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/PhoneHandler.kt similarity index 93% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/PhoneHandler.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/PhoneHandler.kt index 03ccd3002..92faf61fa 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/PhoneHandler.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/PhoneHandler.kt @@ -4,13 +4,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.handler import android.content.ContentValues import android.provider.ContactsContract.CommonDataKinds.Phone -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.LabeledProperty -import at.bitfire.vcard4android.property.CustomType +import at.bitfire.synctools.mapping.contacts.Contact +import at.bitfire.synctools.mapping.contacts.LabeledProperty +import at.bitfire.synctools.vcard.property.CustomType import ezvcard.parameter.TelephoneType import ezvcard.property.Telephone diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/PhotoHandler.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/PhotoHandler.kt similarity index 97% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/PhotoHandler.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/PhotoHandler.kt index f03232c65..ca1c02db5 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/PhotoHandler.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/PhotoHandler.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.handler import android.content.ContentProviderClient import android.content.ContentUris @@ -13,7 +13,7 @@ import android.graphics.Bitmap import android.graphics.BitmapFactory import android.provider.ContactsContract import android.provider.ContactsContract.CommonDataKinds.Photo -import at.bitfire.vcard4android.Contact +import at.bitfire.synctools.mapping.contacts.Contact import java.io.ByteArrayOutputStream import java.io.IOException import java.util.logging.Level diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/RelationHandler.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/RelationHandler.kt similarity index 93% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/RelationHandler.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/RelationHandler.kt index 4e3df4796..12a1f3620 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/RelationHandler.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/RelationHandler.kt @@ -4,13 +4,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.handler import android.content.ContentValues import android.provider.ContactsContract.CommonDataKinds.Relation -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.Utils.trimToNull -import at.bitfire.vcard4android.property.CustomType +import at.bitfire.synctools.mapping.contacts.Contact +import at.bitfire.synctools.util.Utils.trimToNull +import at.bitfire.synctools.vcard.property.CustomType import ezvcard.parameter.RelatedType import ezvcard.property.Related diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/SipAddressHandler.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/SipAddressHandler.kt similarity index 89% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/SipAddressHandler.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/SipAddressHandler.kt index ec28cf573..28608bd6c 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/SipAddressHandler.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/SipAddressHandler.kt @@ -4,12 +4,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.handler import android.content.ContentValues import android.provider.ContactsContract.CommonDataKinds.SipAddress -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.LabeledProperty +import at.bitfire.synctools.mapping.contacts.Contact +import at.bitfire.synctools.mapping.contacts.LabeledProperty import ezvcard.parameter.ImppType import ezvcard.property.Impp diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameHandler.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/StructuredNameHandler.kt similarity index 92% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameHandler.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/StructuredNameHandler.kt index 6e22b58ba..e7b51919f 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameHandler.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/StructuredNameHandler.kt @@ -4,11 +4,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.handler import android.content.ContentValues import android.provider.ContactsContract.CommonDataKinds.StructuredName -import at.bitfire.vcard4android.Contact +import at.bitfire.synctools.mapping.contacts.Contact object StructuredNameHandler: DataRowHandler() { diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalHandler.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/StructuredPostalHandler.kt similarity index 95% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalHandler.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/StructuredPostalHandler.kt index 35ba18c29..f45c52bba 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalHandler.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/StructuredPostalHandler.kt @@ -4,12 +4,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.handler import android.content.ContentValues import android.provider.ContactsContract.CommonDataKinds.StructuredPostal -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.LabeledProperty +import at.bitfire.synctools.mapping.contacts.Contact +import at.bitfire.synctools.mapping.contacts.LabeledProperty import ezvcard.parameter.AddressType import ezvcard.property.Address diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/WebsiteHandler.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/WebsiteHandler.kt similarity index 86% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/WebsiteHandler.kt rename to lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/WebsiteHandler.kt index d7f10749f..d160aa4ab 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/WebsiteHandler.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/contacts/handler/WebsiteHandler.kt @@ -4,13 +4,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.handler import android.content.ContentValues import android.provider.ContactsContract.CommonDataKinds.Website -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.LabeledProperty -import at.bitfire.vcard4android.property.CustomType +import at.bitfire.synctools.mapping.contacts.Contact +import at.bitfire.synctools.mapping.contacts.LabeledProperty +import at.bitfire.synctools.vcard.property.CustomType import ezvcard.property.Url object WebsiteHandler: DataRowHandler() { diff --git a/lib/src/main/kotlin/at/bitfire/synctools/mapping/tasks/builder/DescriptionBuilder.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/tasks/builder/DescriptionBuilder.kt index 8777f0318..24b979efb 100644 --- a/lib/src/main/kotlin/at/bitfire/synctools/mapping/tasks/builder/DescriptionBuilder.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/tasks/builder/DescriptionBuilder.kt @@ -8,7 +8,7 @@ package at.bitfire.synctools.mapping.tasks.builder import android.content.Entity import at.bitfire.ical4android.Task -import at.bitfire.vcard4android.Utils.trimToNull +import at.bitfire.synctools.util.Utils.trimToNull import org.dmfs.tasks.contract.TaskContract.Tasks class DescriptionBuilder : DmfsTaskFieldBuilder { diff --git a/lib/src/main/kotlin/at/bitfire/synctools/mapping/tasks/builder/LocationBuilder.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/tasks/builder/LocationBuilder.kt index 93ce9d208..b27e115f4 100644 --- a/lib/src/main/kotlin/at/bitfire/synctools/mapping/tasks/builder/LocationBuilder.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/tasks/builder/LocationBuilder.kt @@ -8,7 +8,7 @@ package at.bitfire.synctools.mapping.tasks.builder import android.content.Entity import at.bitfire.ical4android.Task -import at.bitfire.vcard4android.Utils.trimToNull +import at.bitfire.synctools.util.Utils.trimToNull import org.dmfs.tasks.contract.TaskContract.Tasks class LocationBuilder : DmfsTaskFieldBuilder { diff --git a/lib/src/main/kotlin/at/bitfire/synctools/mapping/tasks/builder/TitleBuilder.kt b/lib/src/main/kotlin/at/bitfire/synctools/mapping/tasks/builder/TitleBuilder.kt index 5f3107f42..b6b8204f3 100644 --- a/lib/src/main/kotlin/at/bitfire/synctools/mapping/tasks/builder/TitleBuilder.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/mapping/tasks/builder/TitleBuilder.kt @@ -8,7 +8,7 @@ package at.bitfire.synctools.mapping.tasks.builder import android.content.Entity import at.bitfire.ical4android.Task -import at.bitfire.vcard4android.Utils.trimToNull +import at.bitfire.synctools.util.Utils.trimToNull import org.dmfs.tasks.contract.TaskContract.Tasks class TitleBuilder : DmfsTaskFieldBuilder { diff --git a/lib/src/main/kotlin/at/bitfire/synctools/storage/ContactsBatchOperation.kt b/lib/src/main/kotlin/at/bitfire/synctools/storage/ContactsBatchOperation.kt index 66e7c2968..77c2d4914 100644 --- a/lib/src/main/kotlin/at/bitfire/synctools/storage/ContactsBatchOperation.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/storage/ContactsBatchOperation.kt @@ -6,24 +6,5 @@ package at.bitfire.synctools.storage -import android.content.ContentProviderClient - -/** - * [BatchOperation] for the Android contacts provider - */ -class ContactsBatchOperation( - providerClient: ContentProviderClient -): BatchOperation(providerClient, maxOperationsPerYieldPoint = OPERATIONS_PER_YIELD_POINT) { - - companion object { - - /** - * Maximum number of operations per yield point in contacts provider. - * - * See https://android.googlesource.com/platform/packages/providers/ContactsProvider.git/+/refs/heads/android11-release/src/com/android/providers/contacts/AbstractContactsProvider.java#70 - */ - const val OPERATIONS_PER_YIELD_POINT = 499 - - } - -} \ No newline at end of file +@Deprecated("Moved to at.bitfire.synctools.storage.contacts") +typealias ContactsBatchOperation = at.bitfire.synctools.storage.contacts.ContactsBatchOperation diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/AndroidAddressBook.kt b/lib/src/main/kotlin/at/bitfire/synctools/storage/contacts/AndroidAddressBook.kt similarity index 96% rename from lib/src/main/kotlin/at/bitfire/vcard4android/AndroidAddressBook.kt rename to lib/src/main/kotlin/at/bitfire/synctools/storage/contacts/AndroidAddressBook.kt index 2240d79ab..4bab217dc 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/AndroidAddressBook.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/storage/contacts/AndroidAddressBook.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android +package at.bitfire.synctools.storage.contacts import android.accounts.Account import android.content.ContentProviderClient @@ -112,7 +112,7 @@ open class AndroidAddressBook( queryContacts("${RawContacts._ID}=?", arrayOf(id.toString())).firstOrNull() ?: throw FileNotFoundException() fun findContactByUid(uid: String) = - queryContacts("${AndroidContact.COLUMN_UID}=?", arrayOf(uid)).firstOrNull() + queryContacts("${at.bitfire.synctools.storage.contacts.AndroidContact.COLUMN_UID}=?", arrayOf(uid)).firstOrNull() @Throws(FileNotFoundException::class) fun findGroupById(id: Long) = diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/AndroidContact.kt b/lib/src/main/kotlin/at/bitfire/synctools/storage/contacts/AndroidContact.kt similarity index 97% rename from lib/src/main/kotlin/at/bitfire/vcard4android/AndroidContact.kt rename to lib/src/main/kotlin/at/bitfire/synctools/storage/contacts/AndroidContact.kt index 3dadc7378..c2b485720 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/AndroidContact.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/storage/contacts/AndroidContact.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android +package at.bitfire.synctools.storage.contacts import android.content.ContentUris import android.content.ContentValues @@ -16,11 +16,11 @@ import android.provider.ContactsContract import android.provider.ContactsContract.RawContacts import android.provider.ContactsContract.RawContacts.Data import androidx.annotation.CallSuper +import at.bitfire.synctools.mapping.contacts.Contact +import at.bitfire.synctools.mapping.contacts.ContactProcessor +import at.bitfire.synctools.mapping.contacts.builder.PhotoBuilder import at.bitfire.synctools.storage.BatchOperation -import at.bitfire.synctools.storage.ContactsBatchOperation import at.bitfire.synctools.storage.LocalStorageException -import at.bitfire.vcard4android.contactrow.ContactProcessor -import at.bitfire.vcard4android.contactrow.PhotoBuilder import java.io.FileNotFoundException open class AndroidContact( diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/AndroidContactFactory.kt b/lib/src/main/kotlin/at/bitfire/synctools/storage/contacts/AndroidContactFactory.kt similarity index 90% rename from lib/src/main/kotlin/at/bitfire/vcard4android/AndroidContactFactory.kt rename to lib/src/main/kotlin/at/bitfire/synctools/storage/contacts/AndroidContactFactory.kt index bce46c2ac..a1cf8b6b3 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/AndroidContactFactory.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/storage/contacts/AndroidContactFactory.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android +package at.bitfire.synctools.storage.contacts import android.content.ContentValues diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/AndroidGroup.kt b/lib/src/main/kotlin/at/bitfire/synctools/storage/contacts/AndroidGroup.kt similarity index 96% rename from lib/src/main/kotlin/at/bitfire/vcard4android/AndroidGroup.kt rename to lib/src/main/kotlin/at/bitfire/synctools/storage/contacts/AndroidGroup.kt index 64d9cb20d..ca1617ed7 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/AndroidGroup.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/storage/contacts/AndroidGroup.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android +package at.bitfire.synctools.storage.contacts import android.content.ContentUris import android.content.ContentValues @@ -17,6 +17,7 @@ import android.provider.ContactsContract.RawContacts import android.provider.ContactsContract.RawContacts.Data import androidx.annotation.CallSuper import androidx.core.content.contentValuesOf +import at.bitfire.synctools.mapping.contacts.Contact import at.bitfire.synctools.storage.LocalStorageException import at.bitfire.synctools.storage.plusAssign import java.io.FileNotFoundException @@ -95,7 +96,7 @@ open class AndroidGroup( // get UID from the member addressBook.provider.query(addressBook.syncAdapterURI(ContentUris.withAppendedId(RawContacts.CONTENT_URI, contactId)), - arrayOf(AndroidContact.COLUMN_UID), null, null, null)?.use { rawContactCursor -> + arrayOf(at.bitfire.synctools.storage.contacts.AndroidContact.COLUMN_UID), null, null, null)?.use { rawContactCursor -> if (rawContactCursor.moveToNext()) { val uid = rawContactCursor.getString(0) if (!uid.isNullOrBlank()) { diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/AndroidGroupFactory.kt b/lib/src/main/kotlin/at/bitfire/synctools/storage/contacts/AndroidGroupFactory.kt similarity index 90% rename from lib/src/main/kotlin/at/bitfire/vcard4android/AndroidGroupFactory.kt rename to lib/src/main/kotlin/at/bitfire/synctools/storage/contacts/AndroidGroupFactory.kt index d11a21b73..cd4e55887 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/AndroidGroupFactory.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/storage/contacts/AndroidGroupFactory.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android +package at.bitfire.synctools.storage.contacts import android.content.ContentValues diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/CachedGroupMembership.kt b/lib/src/main/kotlin/at/bitfire/synctools/storage/contacts/CachedGroupMembership.kt similarity index 96% rename from lib/src/main/kotlin/at/bitfire/vcard4android/CachedGroupMembership.kt rename to lib/src/main/kotlin/at/bitfire/synctools/storage/contacts/CachedGroupMembership.kt index e81b58983..4ba95bfe6 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/CachedGroupMembership.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/storage/contacts/CachedGroupMembership.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android +package at.bitfire.synctools.storage.contacts import android.provider.ContactsContract.RawContacts.Data diff --git a/lib/src/main/kotlin/at/bitfire/synctools/storage/contacts/ContactsBatchOperation.kt b/lib/src/main/kotlin/at/bitfire/synctools/storage/contacts/ContactsBatchOperation.kt new file mode 100644 index 000000000..f324e2395 --- /dev/null +++ b/lib/src/main/kotlin/at/bitfire/synctools/storage/contacts/ContactsBatchOperation.kt @@ -0,0 +1,30 @@ +/* + * This file is part of bitfireAT/synctools which is released under GPLv3. + * Copyright © All Contributors. See the LICENSE and AUTHOR files in the root directory for details. + * SPDX-License-Identifier: GPL-3.0-or-later + */ + +package at.bitfire.synctools.storage.contacts + +import android.content.ContentProviderClient +import at.bitfire.synctools.storage.BatchOperation + +/** + * [BatchOperation] for the Android contacts provider + */ +class ContactsBatchOperation( + providerClient: ContentProviderClient +): BatchOperation(providerClient, maxOperationsPerYieldPoint = OPERATIONS_PER_YIELD_POINT) { + + companion object { + + /** + * Maximum number of operations per yield point in contacts provider. + * + * See https://android.googlesource.com/platform/packages/providers/ContactsProvider.git/+/refs/heads/android11-release/src/com/android/providers/contacts/AbstractContactsProvider.java#70 + */ + const val OPERATIONS_PER_YIELD_POINT = 499 + + } + +} \ No newline at end of file diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/Utils.kt b/lib/src/main/kotlin/at/bitfire/synctools/util/Utils.kt similarity index 97% rename from lib/src/main/kotlin/at/bitfire/vcard4android/Utils.kt rename to lib/src/main/kotlin/at/bitfire/synctools/util/Utils.kt index 9662c8694..d2e226bc7 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/Utils.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/util/Utils.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android +package at.bitfire.synctools.util import android.accounts.Account import android.net.Uri diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/GroupMethod.kt b/lib/src/main/kotlin/at/bitfire/synctools/vcard/GroupMethod.kt similarity index 94% rename from lib/src/main/kotlin/at/bitfire/vcard4android/GroupMethod.kt rename to lib/src/main/kotlin/at/bitfire/synctools/vcard/GroupMethod.kt index 75e17ba33..4f9c86acb 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/GroupMethod.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/vcard/GroupMethod.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android +package at.bitfire.synctools.vcard enum class GroupMethod { diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/property/CustomScribes.kt b/lib/src/main/kotlin/at/bitfire/synctools/vcard/property/CustomScribes.kt similarity index 96% rename from lib/src/main/kotlin/at/bitfire/vcard4android/property/CustomScribes.kt rename to lib/src/main/kotlin/at/bitfire/synctools/vcard/property/CustomScribes.kt index 2fb47bd5a..114e54949 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/property/CustomScribes.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/vcard/property/CustomScribes.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.property +package at.bitfire.synctools.vcard.property import ezvcard.io.chain.ChainingTextWriter import ezvcard.io.scribe.ScribeIndex diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/property/CustomType.kt b/lib/src/main/kotlin/at/bitfire/synctools/vcard/property/CustomType.kt similarity index 97% rename from lib/src/main/kotlin/at/bitfire/vcard4android/property/CustomType.kt rename to lib/src/main/kotlin/at/bitfire/synctools/vcard/property/CustomType.kt index e27c7f049..69af466ff 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/property/CustomType.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/vcard/property/CustomType.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.property +package at.bitfire.synctools.vcard.property import ezvcard.parameter.EmailType import ezvcard.parameter.RelatedType diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/property/XAbDate.kt b/lib/src/main/kotlin/at/bitfire/synctools/vcard/property/XAbDate.kt similarity index 95% rename from lib/src/main/kotlin/at/bitfire/vcard4android/property/XAbDate.kt rename to lib/src/main/kotlin/at/bitfire/synctools/vcard/property/XAbDate.kt index b4730168b..8baf4893d 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/property/XAbDate.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/vcard/property/XAbDate.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.property +package at.bitfire.synctools.vcard.property import ezvcard.io.scribe.DateOrTimePropertyScribe import ezvcard.property.DateOrTimeProperty diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/property/XAbLabel.kt b/lib/src/main/kotlin/at/bitfire/synctools/vcard/property/XAbLabel.kt similarity index 93% rename from lib/src/main/kotlin/at/bitfire/vcard4android/property/XAbLabel.kt rename to lib/src/main/kotlin/at/bitfire/synctools/vcard/property/XAbLabel.kt index 1688a56b7..58b1f6b07 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/property/XAbLabel.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/vcard/property/XAbLabel.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.property +package at.bitfire.synctools.vcard.property import ezvcard.io.scribe.StringPropertyScribe import ezvcard.property.TextProperty diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/property/XAbRelatedNames.kt b/lib/src/main/kotlin/at/bitfire/synctools/vcard/property/XAbRelatedNames.kt similarity index 96% rename from lib/src/main/kotlin/at/bitfire/vcard4android/property/XAbRelatedNames.kt rename to lib/src/main/kotlin/at/bitfire/synctools/vcard/property/XAbRelatedNames.kt index 3899d854f..7ff0f3552 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/property/XAbRelatedNames.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/vcard/property/XAbRelatedNames.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.property +package at.bitfire.synctools.vcard.property import ezvcard.io.scribe.StringPropertyScribe import ezvcard.property.TextProperty diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/property/XAddressBookServerKind.kt b/lib/src/main/kotlin/at/bitfire/synctools/vcard/property/XAddressBookServerKind.kt similarity index 93% rename from lib/src/main/kotlin/at/bitfire/vcard4android/property/XAddressBookServerKind.kt rename to lib/src/main/kotlin/at/bitfire/synctools/vcard/property/XAddressBookServerKind.kt index c0745d88b..83bb9cbd8 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/property/XAddressBookServerKind.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/vcard/property/XAddressBookServerKind.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.property +package at.bitfire.synctools.vcard.property import ezvcard.io.scribe.StringPropertyScribe import ezvcard.property.Kind diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/property/XAddressBookServerMember.kt b/lib/src/main/kotlin/at/bitfire/synctools/vcard/property/XAddressBookServerMember.kt similarity index 93% rename from lib/src/main/kotlin/at/bitfire/vcard4android/property/XAddressBookServerMember.kt rename to lib/src/main/kotlin/at/bitfire/synctools/vcard/property/XAddressBookServerMember.kt index 29344cb45..d470d717c 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/property/XAddressBookServerMember.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/vcard/property/XAddressBookServerMember.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.property +package at.bitfire.synctools.vcard.property import ezvcard.io.scribe.UriPropertyScribe import ezvcard.property.Member diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/property/XPhoneticFirstName.kt b/lib/src/main/kotlin/at/bitfire/synctools/vcard/property/XPhoneticFirstName.kt similarity index 93% rename from lib/src/main/kotlin/at/bitfire/vcard4android/property/XPhoneticFirstName.kt rename to lib/src/main/kotlin/at/bitfire/synctools/vcard/property/XPhoneticFirstName.kt index 4dec27bb5..5cf0dd960 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/property/XPhoneticFirstName.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/vcard/property/XPhoneticFirstName.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.property +package at.bitfire.synctools.vcard.property import ezvcard.io.scribe.StringPropertyScribe import ezvcard.property.TextProperty diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/property/XPhoneticLastName.kt b/lib/src/main/kotlin/at/bitfire/synctools/vcard/property/XPhoneticLastName.kt similarity index 93% rename from lib/src/main/kotlin/at/bitfire/vcard4android/property/XPhoneticLastName.kt rename to lib/src/main/kotlin/at/bitfire/synctools/vcard/property/XPhoneticLastName.kt index 235b42668..21f1940c4 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/property/XPhoneticLastName.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/vcard/property/XPhoneticLastName.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.property +package at.bitfire.synctools.vcard.property import ezvcard.io.scribe.StringPropertyScribe import ezvcard.property.TextProperty diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/property/XPhoneticMiddleName.kt b/lib/src/main/kotlin/at/bitfire/synctools/vcard/property/XPhoneticMiddleName.kt similarity index 93% rename from lib/src/main/kotlin/at/bitfire/vcard4android/property/XPhoneticMiddleName.kt rename to lib/src/main/kotlin/at/bitfire/synctools/vcard/property/XPhoneticMiddleName.kt index bf32e4ae2..589cef93d 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/property/XPhoneticMiddleName.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/vcard/property/XPhoneticMiddleName.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.property +package at.bitfire.synctools.vcard.property import ezvcard.io.scribe.StringPropertyScribe import ezvcard.property.TextProperty diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/property/XSip.kt b/lib/src/main/kotlin/at/bitfire/synctools/vcard/property/XSip.kt similarity index 92% rename from lib/src/main/kotlin/at/bitfire/vcard4android/property/XSip.kt rename to lib/src/main/kotlin/at/bitfire/synctools/vcard/property/XSip.kt index 81a596b5c..2240cac92 100644 --- a/lib/src/main/kotlin/at/bitfire/vcard4android/property/XSip.kt +++ b/lib/src/main/kotlin/at/bitfire/synctools/vcard/property/XSip.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.property +package at.bitfire.synctools.vcard.property import ezvcard.io.scribe.StringPropertyScribe import ezvcard.property.TextProperty diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/Constants.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/Constants.kt similarity index 85% rename from lib/src/test/kotlin/at/bitfire/vcard4android/Constants.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/Constants.kt index d5c9f939c..830c2ed13 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/Constants.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/Constants.kt @@ -4,6 +4,6 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android +package at.bitfire.synctools.mapping.contacts val testProductId = "bitfireAT/synctools test" \ No newline at end of file diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/ContactReaderTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/ContactReaderTest.kt similarity index 96% rename from lib/src/test/kotlin/at/bitfire/vcard4android/ContactReaderTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/ContactReaderTest.kt index bea46c5a5..0ee44f9d3 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/ContactReaderTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/ContactReaderTest.kt @@ -4,17 +4,18 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android - -import at.bitfire.vcard4android.property.CustomType -import at.bitfire.vcard4android.property.XAbDate -import at.bitfire.vcard4android.property.XAbLabel -import at.bitfire.vcard4android.property.XAbRelatedNames -import at.bitfire.vcard4android.property.XAddressBookServerKind -import at.bitfire.vcard4android.property.XPhoneticFirstName -import at.bitfire.vcard4android.property.XPhoneticLastName -import at.bitfire.vcard4android.property.XPhoneticMiddleName -import at.bitfire.vcard4android.property.XSip +package at.bitfire.synctools.mapping.contacts + +import at.bitfire.synctools.mapping.contacts.Contact.Downloader +import at.bitfire.synctools.vcard.property.CustomType +import at.bitfire.synctools.vcard.property.XAbDate +import at.bitfire.synctools.vcard.property.XAbLabel +import at.bitfire.synctools.vcard.property.XAbRelatedNames +import at.bitfire.synctools.vcard.property.XAddressBookServerKind +import at.bitfire.synctools.vcard.property.XPhoneticFirstName +import at.bitfire.synctools.vcard.property.XPhoneticLastName +import at.bitfire.synctools.vcard.property.XPhoneticMiddleName +import at.bitfire.synctools.vcard.property.XSip import ezvcard.VCard import ezvcard.VCardVersion import ezvcard.parameter.ImageType @@ -678,7 +679,7 @@ class ContactReaderTest { fun testGetPhotoBytes_Downloader() = runTest { val sample = ByteArray(128) val sampleUrl = "http://example.com/photo.jpg" - val downloader = object: Contact.Downloader { + val downloader = object: Downloader { override suspend fun download(url: String, accepts: String): ByteArray? { return if (url == sampleUrl && accepts == "image/*") sample diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/ContactTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/ContactTest.kt similarity index 99% rename from lib/src/test/kotlin/at/bitfire/vcard4android/ContactTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/ContactTest.kt index fcbe4a287..fa0e5d10f 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/ContactTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/ContactTest.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android +package at.bitfire.synctools.mapping.contacts import ezvcard.VCardVersion import ezvcard.parameter.AddressType diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/ContactWriterTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/ContactWriterTest.kt similarity index 97% rename from lib/src/test/kotlin/at/bitfire/vcard4android/ContactWriterTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/ContactWriterTest.kt index e72e47cad..b2ef3279c 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/ContactWriterTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/ContactWriterTest.kt @@ -4,17 +4,17 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android - -import at.bitfire.vcard4android.property.CustomType -import at.bitfire.vcard4android.property.XAbDate -import at.bitfire.vcard4android.property.XAbLabel -import at.bitfire.vcard4android.property.XAbRelatedNames -import at.bitfire.vcard4android.property.XAddressBookServerKind -import at.bitfire.vcard4android.property.XAddressBookServerMember -import at.bitfire.vcard4android.property.XPhoneticFirstName -import at.bitfire.vcard4android.property.XPhoneticLastName -import at.bitfire.vcard4android.property.XPhoneticMiddleName +package at.bitfire.synctools.mapping.contacts + +import at.bitfire.synctools.vcard.property.CustomType +import at.bitfire.synctools.vcard.property.XAbDate +import at.bitfire.synctools.vcard.property.XAbLabel +import at.bitfire.synctools.vcard.property.XAbRelatedNames +import at.bitfire.synctools.vcard.property.XAddressBookServerKind +import at.bitfire.synctools.vcard.property.XAddressBookServerMember +import at.bitfire.synctools.vcard.property.XPhoneticFirstName +import at.bitfire.synctools.vcard.property.XPhoneticLastName +import at.bitfire.synctools.vcard.property.XPhoneticMiddleName import ezvcard.Ezvcard import ezvcard.VCard import ezvcard.VCardVersion diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/DataRowBuilderTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/DataRowBuilderTest.kt similarity index 92% rename from lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/DataRowBuilderTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/DataRowBuilderTest.kt index a691aac9c..803b75339 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/DataRowBuilderTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/DataRowBuilderTest.kt @@ -4,11 +4,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.builder import android.net.Uri +import at.bitfire.synctools.mapping.contacts.Contact import at.bitfire.synctools.storage.BatchOperation -import at.bitfire.vcard4android.Contact import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/EmailBuilderTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/EmailBuilderTest.kt similarity index 94% rename from lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/EmailBuilderTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/EmailBuilderTest.kt index a79331b6a..74dedba27 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/EmailBuilderTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/EmailBuilderTest.kt @@ -4,13 +4,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.builder import android.net.Uri import android.provider.ContactsContract.CommonDataKinds -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.LabeledProperty -import at.bitfire.vcard4android.property.CustomType +import at.bitfire.synctools.mapping.contacts.Contact +import at.bitfire.synctools.mapping.contacts.LabeledProperty +import at.bitfire.synctools.vcard.property.CustomType import ezvcard.parameter.EmailType import ezvcard.property.Email import org.junit.Assert.assertEquals diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/EventBuilderTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/EventBuilderTest.kt similarity index 96% rename from lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/EventBuilderTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/EventBuilderTest.kt index f79b8509f..5245189d0 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/EventBuilderTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/EventBuilderTest.kt @@ -4,13 +4,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.builder import android.net.Uri import android.provider.ContactsContract.CommonDataKinds -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.LabeledProperty -import at.bitfire.vcard4android.property.XAbDate +import at.bitfire.synctools.mapping.contacts.Contact +import at.bitfire.synctools.mapping.contacts.LabeledProperty +import at.bitfire.synctools.vcard.property.XAbDate import ezvcard.property.Anniversary import ezvcard.property.Birthday import ezvcard.util.PartialDate diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/ImBuilderTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/ImBuilderTest.kt similarity index 96% rename from lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/ImBuilderTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/ImBuilderTest.kt index 417fbe51c..1d11e5e58 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/ImBuilderTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/ImBuilderTest.kt @@ -4,12 +4,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.builder import android.net.Uri import android.provider.ContactsContract.CommonDataKinds -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.LabeledProperty +import at.bitfire.synctools.mapping.contacts.Contact +import at.bitfire.synctools.mapping.contacts.LabeledProperty import ezvcard.parameter.ImppType import ezvcard.property.Impp import org.junit.Assert.assertEquals diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/NicknameBuilderTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/NicknameBuilderTest.kt similarity index 94% rename from lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/NicknameBuilderTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/NicknameBuilderTest.kt index 70ee5d976..29c2bbee2 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/NicknameBuilderTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/NicknameBuilderTest.kt @@ -4,13 +4,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.builder import android.net.Uri import android.provider.ContactsContract.CommonDataKinds -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.LabeledProperty -import at.bitfire.vcard4android.property.CustomType +import at.bitfire.synctools.mapping.contacts.Contact +import at.bitfire.synctools.mapping.contacts.LabeledProperty +import at.bitfire.synctools.vcard.property.CustomType import ezvcard.property.Nickname import org.junit.Assert.assertEquals import org.junit.Test diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/NoteBuilderTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/NoteBuilderTest.kt similarity index 92% rename from lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/NoteBuilderTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/NoteBuilderTest.kt index a612a5bc7..e886dea3f 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/NoteBuilderTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/NoteBuilderTest.kt @@ -4,11 +4,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.builder import android.net.Uri import android.provider.ContactsContract.CommonDataKinds -import at.bitfire.vcard4android.Contact +import at.bitfire.synctools.mapping.contacts.Contact import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/OrganizationBuilderTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/OrganizationBuilderTest.kt similarity index 97% rename from lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/OrganizationBuilderTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/OrganizationBuilderTest.kt index 9b4fe40cb..ca5498a71 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/OrganizationBuilderTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/OrganizationBuilderTest.kt @@ -4,11 +4,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.builder import android.net.Uri import android.provider.ContactsContract.CommonDataKinds -import at.bitfire.vcard4android.Contact +import at.bitfire.synctools.mapping.contacts.Contact import ezvcard.property.Organization import org.junit.Assert.assertEquals import org.junit.Assert.assertNull diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/PhoneBuilderTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/PhoneBuilderTest.kt similarity index 97% rename from lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/PhoneBuilderTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/PhoneBuilderTest.kt index b315a8efb..942a476a4 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/PhoneBuilderTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/PhoneBuilderTest.kt @@ -4,13 +4,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.builder import android.net.Uri import android.provider.ContactsContract.CommonDataKinds -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.LabeledProperty -import at.bitfire.vcard4android.property.CustomType +import at.bitfire.synctools.mapping.contacts.Contact +import at.bitfire.synctools.mapping.contacts.LabeledProperty +import at.bitfire.synctools.vcard.property.CustomType import ezvcard.parameter.TelephoneType import ezvcard.property.Telephone import ezvcard.util.TelUri diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/RelationBuilderTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/RelationBuilderTest.kt similarity index 98% rename from lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/RelationBuilderTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/RelationBuilderTest.kt index 7e19e474b..79dbb68e5 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/RelationBuilderTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/RelationBuilderTest.kt @@ -4,12 +4,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.builder import android.net.Uri import android.provider.ContactsContract.CommonDataKinds.Relation -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.property.CustomType +import at.bitfire.synctools.mapping.contacts.Contact +import at.bitfire.synctools.vcard.property.CustomType import ezvcard.parameter.RelatedType import ezvcard.property.Related import org.junit.Assert.assertEquals diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/SipAddressBuilderTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/SipAddressBuilderTest.kt similarity index 95% rename from lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/SipAddressBuilderTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/SipAddressBuilderTest.kt index d14bfe3c5..7f4dba355 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/SipAddressBuilderTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/SipAddressBuilderTest.kt @@ -4,12 +4,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.builder import android.net.Uri import android.provider.ContactsContract.CommonDataKinds.SipAddress -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.LabeledProperty +import at.bitfire.synctools.mapping.contacts.Contact +import at.bitfire.synctools.mapping.contacts.LabeledProperty import ezvcard.parameter.ImppType import ezvcard.property.Impp import org.junit.Assert.assertEquals diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameBuilderTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/StructuredNameBuilderTest.kt similarity index 96% rename from lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameBuilderTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/StructuredNameBuilderTest.kt index f0088b09f..7b277bb75 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameBuilderTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/StructuredNameBuilderTest.kt @@ -4,12 +4,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.builder import android.net.Uri import android.provider.ContactsContract.CommonDataKinds.StructuredName -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.LabeledProperty +import at.bitfire.synctools.mapping.contacts.Contact +import at.bitfire.synctools.mapping.contacts.LabeledProperty import ezvcard.property.Email import ezvcard.property.Nickname import ezvcard.property.Organization diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalBuilderTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/StructuredPostalBuilderTest.kt similarity index 96% rename from lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalBuilderTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/StructuredPostalBuilderTest.kt index 7e31d5406..858618a1c 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalBuilderTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/StructuredPostalBuilderTest.kt @@ -4,12 +4,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.builder import android.net.Uri import android.provider.ContactsContract.CommonDataKinds.StructuredPostal -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.LabeledProperty +import at.bitfire.synctools.mapping.contacts.Contact +import at.bitfire.synctools.mapping.contacts.LabeledProperty import ezvcard.parameter.AddressType import ezvcard.property.Address import org.junit.Assert.assertEquals diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/WebsiteBuilderTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/WebsiteBuilderTest.kt similarity index 95% rename from lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/WebsiteBuilderTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/WebsiteBuilderTest.kt index 1ed89e3cc..cafde8343 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/WebsiteBuilderTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/builder/WebsiteBuilderTest.kt @@ -4,13 +4,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.builder import android.net.Uri import android.provider.ContactsContract.CommonDataKinds -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.LabeledProperty -import at.bitfire.vcard4android.property.CustomType +import at.bitfire.synctools.mapping.contacts.Contact +import at.bitfire.synctools.mapping.contacts.LabeledProperty +import at.bitfire.synctools.vcard.property.CustomType import ezvcard.property.Url import org.junit.Assert.assertEquals import org.junit.Test diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/EmailHandlerTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/EmailHandlerTest.kt similarity index 96% rename from lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/EmailHandlerTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/EmailHandlerTest.kt index 82b144f80..1c90ef7de 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/EmailHandlerTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/EmailHandlerTest.kt @@ -4,12 +4,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.handler import android.content.ContentValues import android.provider.ContactsContract.CommonDataKinds.Email -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.property.CustomType +import at.bitfire.synctools.mapping.contacts.Contact +import at.bitfire.synctools.vcard.property.CustomType import ezvcard.parameter.EmailType import org.junit.Assert.assertArrayEquals import org.junit.Assert.assertEquals diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/EventHandlerTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/EventHandlerTest.kt similarity index 98% rename from lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/EventHandlerTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/EventHandlerTest.kt index 55175e23c..baf9a7637 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/EventHandlerTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/EventHandlerTest.kt @@ -4,11 +4,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.handler import android.content.ContentValues import android.provider.ContactsContract.CommonDataKinds.Event -import at.bitfire.vcard4android.Contact +import at.bitfire.synctools.mapping.contacts.Contact import ezvcard.util.PartialDate import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/ImHandlerTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/ImHandlerTest.kt similarity index 97% rename from lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/ImHandlerTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/ImHandlerTest.kt index f65434c78..098e69814 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/ImHandlerTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/ImHandlerTest.kt @@ -4,11 +4,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.handler import android.content.ContentValues import android.provider.ContactsContract.CommonDataKinds.Im -import at.bitfire.vcard4android.Contact +import at.bitfire.synctools.mapping.contacts.Contact import ezvcard.parameter.ImppType import org.junit.Assert.assertEquals import org.junit.Assert.assertNull diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/NicknameHandlerTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/NicknameHandlerTest.kt similarity index 94% rename from lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/NicknameHandlerTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/NicknameHandlerTest.kt index 28965f89e..9c601f9d0 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/NicknameHandlerTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/NicknameHandlerTest.kt @@ -4,12 +4,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.handler import android.content.ContentValues import android.provider.ContactsContract.CommonDataKinds.Nickname -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.property.CustomType +import at.bitfire.synctools.mapping.contacts.Contact +import at.bitfire.synctools.vcard.property.CustomType import org.junit.Assert.assertEquals import org.junit.Assert.assertNull import org.junit.Test diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/NoteHandlerTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/NoteHandlerTest.kt similarity index 90% rename from lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/NoteHandlerTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/NoteHandlerTest.kt index f5c40edf5..da437a8a5 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/NoteHandlerTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/NoteHandlerTest.kt @@ -4,11 +4,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.handler import android.content.ContentValues import android.provider.ContactsContract.CommonDataKinds.Note -import at.bitfire.vcard4android.Contact +import at.bitfire.synctools.mapping.contacts.Contact import org.junit.Assert.assertEquals import org.junit.Assert.assertNull import org.junit.Test diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/OrganizationHandlerTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/OrganizationHandlerTest.kt similarity index 96% rename from lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/OrganizationHandlerTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/OrganizationHandlerTest.kt index fa311de39..90b31b0ad 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/OrganizationHandlerTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/OrganizationHandlerTest.kt @@ -4,11 +4,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.handler import android.content.ContentValues import android.provider.ContactsContract.CommonDataKinds.Organization -import at.bitfire.vcard4android.Contact +import at.bitfire.synctools.mapping.contacts.Contact import org.junit.Assert.assertEquals import org.junit.Assert.assertNull import org.junit.Test diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/PhoneHandlerTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/PhoneHandlerTest.kt similarity index 97% rename from lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/PhoneHandlerTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/PhoneHandlerTest.kt index 6cbd3ba2a..12e3e0ac9 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/PhoneHandlerTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/PhoneHandlerTest.kt @@ -4,12 +4,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.handler import android.content.ContentValues import android.provider.ContactsContract.CommonDataKinds.Phone -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.property.CustomType +import at.bitfire.synctools.mapping.contacts.Contact +import at.bitfire.synctools.vcard.property.CustomType import ezvcard.parameter.TelephoneType import org.junit.Assert.assertArrayEquals import org.junit.Assert.assertEquals diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/RelationHandlerTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/RelationHandlerTest.kt similarity index 97% rename from lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/RelationHandlerTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/RelationHandlerTest.kt index 384cdca07..9fa3b7271 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/RelationHandlerTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/RelationHandlerTest.kt @@ -4,12 +4,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.handler import android.content.ContentValues import android.provider.ContactsContract.CommonDataKinds.Relation -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.property.CustomType +import at.bitfire.synctools.mapping.contacts.Contact +import at.bitfire.synctools.vcard.property.CustomType import ezvcard.parameter.RelatedType import org.junit.Assert.assertArrayEquals import org.junit.Assert.assertEquals diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/SipAddressHandlerTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/SipAddressHandlerTest.kt similarity index 96% rename from lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/SipAddressHandlerTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/SipAddressHandlerTest.kt index be8cdf102..c65101f7c 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/SipAddressHandlerTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/SipAddressHandlerTest.kt @@ -4,11 +4,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.handler import android.content.ContentValues import android.provider.ContactsContract.CommonDataKinds.SipAddress -import at.bitfire.vcard4android.Contact +import at.bitfire.synctools.mapping.contacts.Contact import ezvcard.parameter.ImppType import org.junit.Assert.assertEquals import org.junit.Assert.assertNull diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameHandlerTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/StructuredNameHandlerTest.kt similarity index 95% rename from lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameHandlerTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/StructuredNameHandlerTest.kt index 0a4958c97..28d6cfba7 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameHandlerTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/StructuredNameHandlerTest.kt @@ -4,11 +4,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.handler import android.content.ContentValues import android.provider.ContactsContract.CommonDataKinds.StructuredName -import at.bitfire.vcard4android.Contact +import at.bitfire.synctools.mapping.contacts.Contact import org.junit.Assert.assertEquals import org.junit.Assert.assertNull import org.junit.Test diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalHandlerTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/StructuredPostalHandlerTest.kt similarity index 97% rename from lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalHandlerTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/StructuredPostalHandlerTest.kt index 5391de971..18a73ca9d 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalHandlerTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/StructuredPostalHandlerTest.kt @@ -4,11 +4,11 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.handler import android.content.ContentValues import android.provider.ContactsContract.CommonDataKinds.StructuredPostal -import at.bitfire.vcard4android.Contact +import at.bitfire.synctools.mapping.contacts.Contact import ezvcard.parameter.AddressType import org.junit.Assert.assertArrayEquals import org.junit.Assert.assertEquals diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/WebsiteHandlerTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/WebsiteHandlerTest.kt similarity index 95% rename from lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/WebsiteHandlerTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/WebsiteHandlerTest.kt index 844f8f2a9..dc837cd62 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/WebsiteHandlerTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/mapping/contacts/handler/WebsiteHandlerTest.kt @@ -4,12 +4,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android.contactrow +package at.bitfire.synctools.mapping.contacts.handler import android.content.ContentValues import android.provider.ContactsContract.CommonDataKinds.Website -import at.bitfire.vcard4android.Contact -import at.bitfire.vcard4android.property.CustomType +import at.bitfire.synctools.mapping.contacts.Contact +import at.bitfire.synctools.vcard.property.CustomType import org.junit.Assert.assertEquals import org.junit.Assert.assertNull import org.junit.Assert.assertTrue diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/EzVCardTest.kt b/lib/src/test/kotlin/at/bitfire/synctools/vcard/EzVCardTest.kt similarity index 80% rename from lib/src/test/kotlin/at/bitfire/vcard4android/EzVCardTest.kt rename to lib/src/test/kotlin/at/bitfire/synctools/vcard/EzVCardTest.kt index 36dbb531a..6f655b45d 100644 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/EzVCardTest.kt +++ b/lib/src/test/kotlin/at/bitfire/synctools/vcard/EzVCardTest.kt @@ -4,16 +4,13 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -package at.bitfire.vcard4android +package at.bitfire.synctools.vcard import ezvcard.Ezvcard import ezvcard.VCard import ezvcard.VCardVersion import ezvcard.property.Address -import org.junit.Assert.assertArrayEquals -import org.junit.Assert.assertEquals -import org.junit.Assert.assertNotNull -import org.junit.Assert.assertTrue +import org.junit.Assert import org.junit.Test class EzVCardTest { @@ -25,7 +22,7 @@ class EzVCardTest { "VERSION:4.0\r\n" + "KIND:GROUP\r\n" + "END:VCARD").first() - assertTrue(vCard.kind.isGroup) + Assert.assertTrue(vCard.kind.isGroup) } @Test @@ -35,7 +32,7 @@ class EzVCardTest { "PHOTO;ENCODING=b;TYPE=JPEG:dGVzdA==\r\n" + "END:VCARD").first() // decodes binary data - assertArrayEquals("test".toByteArray(), vCard.photos.first().data) + Assert.assertArrayEquals("test".toByteArray(), vCard.photos.first().data) } @Test @@ -46,7 +43,7 @@ class EzVCardTest { "END:VCARD").first() val photo = vCard.photos.first() // decodes binary data - assertArrayEquals("test".toByteArray(), vCard.photos.first().data) + Assert.assertArrayEquals("test".toByteArray(), vCard.photos.first().data) } @Test @@ -56,7 +53,7 @@ class EzVCardTest { "PHOTO:data:image/png;base64,dGVzdA==\r\n" + "END:VCARD").first() // decodes data URI - assertArrayEquals("test".toByteArray(), vCard.photos.first().data) + Assert.assertArrayEquals("test".toByteArray(), vCard.photos.first().data) } @Test @@ -65,7 +62,7 @@ class EzVCardTest { "VERSION:4.0\r\n" + "REV:20161218T201900Z\r\n" + "END:VCARD").first() - assertNotNull(vCard.revision) + Assert.assertNotNull(vCard.revision) } @Test @@ -74,7 +71,7 @@ class EzVCardTest { "VERSION:4.0\r\n" + "REV:2016-11-27T15:49:53.762Z\r\n" + "END:VCARD").first() - assertNotNull(vCard.revision) + Assert.assertNotNull(vCard.revision) } @Test @@ -83,7 +80,7 @@ class EzVCardTest { "VERSION:4.0\r\n" + "REV:20161218T201900\r\n" + "END:VCARD").first() - assertNotNull(vCard.revision) + Assert.assertNotNull(vCard.revision) } @Test @@ -92,7 +89,7 @@ class EzVCardTest { "VERSION:4.0\r\n" + "REV:20161218T201900-05\r\n" + "END:VCARD").first() - assertNotNull(vCard.revision) + Assert.assertNotNull(vCard.revision) } @Test @@ -101,7 +98,7 @@ class EzVCardTest { "VERSION:4.0\r\n" + "REV:20161218T201900-0530\r\n" + "END:VCARD").first() - assertNotNull(vCard.revision) + Assert.assertNotNull(vCard.revision) } @Test @@ -112,12 +109,12 @@ class EzVCardTest { streetAddress = "Line 1" country = "Line 2" }) - val str = Ezvcard .write(vCard) + val str = Ezvcard.write(vCard) .version(VCardVersion.V4_0) .caretEncoding(true) .go().lines().filter { it.startsWith("ADR") }.first() //assertEquals("ADR;LABEL=\"Li^^ne 1,1^n- ^' -\":;;Line 1;;;;Line 2", str) - assertEquals("ADR;LABEL=\"Li^^ne 1,1\\n- ^' -\":;;Line 1;;;;Line 2", str) + Assert.assertEquals("ADR;LABEL=\"Li^^ne 1,1\\n- ^' -\":;;Line 1;;;;Line 2", str) } -} +} \ No newline at end of file diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/UtilsTest.kt b/lib/src/test/kotlin/at/bitfire/vcard4android/UtilsTest.kt deleted file mode 100644 index 9ed67e9a9..000000000 --- a/lib/src/test/kotlin/at/bitfire/vcard4android/UtilsTest.kt +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of bitfireAT/synctools which is released under GPLv3. - * Copyright © All Contributors. See the LICENSE and AUTHOR files in the root directory for details. - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -package at.bitfire.vcard4android - -import at.bitfire.vcard4android.Utils.capitalize -import at.bitfire.vcard4android.Utils.trimToNull -import org.junit.Assert.assertEquals -import org.junit.Assert.assertNull -import org.junit.Test - -class UtilsTest { - @Test - fun testCapitalize() { - assertEquals("Utils Test", "utils test".capitalize()) // Test multiple words - assertEquals("Utils", "utils".capitalize()) // Test single word - assertEquals("", "".capitalize()) // Test empty string - } - - @Test - fun testTrimToNull() { - assertEquals("test", " test".trimToNull()) // Test spaces only before - assertEquals("test", "test ".trimToNull()) // Test spaces only after - assertEquals("test", " test ".trimToNull()) // Test spaces before and after - assertNull(" ".trimToNull()) // Test spaces - assertNull("".trimToNull()) // Test empty string - } -}