Skip to content
This repository was archived by the owner on Jun 9, 2025. It is now read-only.

Commit 7a29025

Browse files
ArnyminerZArnyminerZ
committed
Replaced account by addressBookAccount
Signed-off-by: Arnau Mora Gras <[email protected]>
1 parent 5439c1f commit 7a29025

File tree

10 files changed

+39
-39
lines changed

10 files changed

+39
-39
lines changed

‎lib/src/androidTest/kotlin/at/bitfire/vcard4android/AndroidAddressBookTest.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class AndroidAddressBookTest {
2222
@ClassRule
2323
val permissionRule = GrantPermissionRule.grant(Manifest.permission.READ_CONTACTS, Manifest.permission.WRITE_CONTACTS)!!
2424

25-
private val testAccount = Account("AndroidAddressBookTest", "at.bitfire.vcard4android")
25+
private val testAddressBookAccount = Account("AndroidAddressBookTest", "at.bitfire.vcard4android")
2626
private lateinit var provider: ContentProviderClient
2727

2828
@BeforeClass
@@ -44,7 +44,7 @@ class AndroidAddressBookTest {
4444

4545
@Test
4646
fun testSettings() {
47-
val addressBook = TestAddressBook(testAccount, provider)
47+
val addressBook = TestAddressBook(testAddressBookAccount, provider)
4848

4949
var values = ContentValues()
5050
values.put(ContactsContract.Settings.SHOULD_SYNC, false)
@@ -65,7 +65,7 @@ class AndroidAddressBookTest {
6565

6666
@Test
6767
fun testSyncState() {
68-
val addressBook = TestAddressBook(testAccount, provider)
68+
val addressBook = TestAddressBook(testAddressBookAccount, provider)
6969

7070
addressBook.syncState = ByteArray(0)
7171
assertEquals(0, addressBook.syncState!!.size)

‎lib/src/androidTest/kotlin/at/bitfire/vcard4android/AndroidContactTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class AndroidContactTest {
3535
@ClassRule
3636
val permissionRule = GrantPermissionRule.grant(Manifest.permission.READ_CONTACTS, Manifest.permission.WRITE_CONTACTS)!!
3737

38-
private val testAccount = Account("AndroidContactTest", "at.bitfire.vcard4android")
38+
private val testAddressBookAccount = Account("AndroidContactTest", "at.bitfire.vcard4android")
3939

4040
private lateinit var provider: ContentProviderClient
4141
private lateinit var addressBook: TestAddressBook
@@ -47,7 +47,7 @@ class AndroidContactTest {
4747
provider = context.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY)!!
4848
assertNotNull(provider)
4949

50-
addressBook = TestAddressBook(testAccount, provider)
50+
addressBook = TestAddressBook(testAddressBookAccount, provider)
5151
}
5252

5353
@BeforeClass

‎lib/src/androidTest/kotlin/at/bitfire/vcard4android/AndroidGroupTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class AndroidGroupTest {
2424
@ClassRule
2525
val permissionRule = GrantPermissionRule.grant(Manifest.permission.READ_CONTACTS, Manifest.permission.WRITE_CONTACTS)!!
2626

27-
private val testAccount = Account("AndroidContactGroupTest", "at.bitfire.vcard4android")
27+
private val testAddressBookAccount = Account("AndroidContactGroupTest", "at.bitfire.vcard4android")
2828

2929
private lateinit var provider: ContentProviderClient
3030
private lateinit var addressBook: TestAddressBook
@@ -36,7 +36,7 @@ class AndroidGroupTest {
3636
provider = context.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY)!!
3737
assertNotNull(provider)
3838

39-
addressBook = TestAddressBook(testAccount, provider)
39+
addressBook = TestAddressBook(testAddressBookAccount, provider)
4040
}
4141

4242
@BeforeClass

‎lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/PhotoBuilderTest.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class PhotoBuilderTest {
3131
@ClassRule
3232
val permissionRule = GrantPermissionRule.grant(Manifest.permission.READ_CONTACTS, Manifest.permission.WRITE_CONTACTS)!!
3333

34-
private val testAccount = Account("AndroidContactTest", "at.bitfire.vcard4android")
34+
private val testAddressBookAccount = Account("AndroidContactTest", "at.bitfire.vcard4android")
3535

3636
val testContext = InstrumentationRegistry.getInstrumentation().context
3737
private lateinit var provider: ContentProviderClient
@@ -43,7 +43,7 @@ class PhotoBuilderTest {
4343
provider = testContext.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY)!!
4444
assertNotNull(provider)
4545

46-
addressBook = TestAddressBook(testAccount, provider)
46+
addressBook = TestAddressBook(testAddressBookAccount, provider)
4747
}
4848

4949
@BeforeClass
@@ -82,7 +82,7 @@ class PhotoBuilderTest {
8282

8383
try {
8484
val photo = TestUtils.resourceToByteArray("/large.jpg")
85-
val photoUri = PhotoBuilder.insertPhoto(provider, testAccount, rawContactId, photo)
85+
val photoUri = PhotoBuilder.insertPhoto(provider, testAddressBookAccount, rawContactId, photo)
8686
assertNotNull(photoUri)
8787

8888
// the photo is processed and often resized by the contacts provider
@@ -114,7 +114,7 @@ class PhotoBuilderTest {
114114
val contact = AndroidContact(addressBook, Contact().apply { displayName = "Contact with photo" }, null, null)
115115
contact.add()
116116
try {
117-
assertNull(PhotoBuilder.insertPhoto(provider, testAccount, contact.id!!, ByteArray(100) /* invalid photo */))
117+
assertNull(PhotoBuilder.insertPhoto(provider, testAddressBookAccount, contact.id!!, ByteArray(100) /* invalid photo */))
118118
} finally {
119119
contact.delete()
120120
}

‎lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/PhotoHandlerTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class PhotoHandlerTest {
3232
@ClassRule
3333
val permissionRule = GrantPermissionRule.grant(Manifest.permission.READ_CONTACTS, Manifest.permission.WRITE_CONTACTS)!!
3434

35-
private val testAccount = Account("AndroidContactTest", "at.bitfire.vcard4android")
35+
private val testAddressBookAccount = Account("AndroidContactTest", "at.bitfire.vcard4android")
3636

3737
val testContext = InstrumentationRegistry.getInstrumentation().context
3838
private lateinit var provider: ContentProviderClient
@@ -44,7 +44,7 @@ class PhotoHandlerTest {
4444
provider = testContext.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY)!!
4545
Assert.assertNotNull(provider)
4646

47-
addressBook = TestAddressBook(testAccount, provider)
47+
addressBook = TestAddressBook(testAddressBookAccount, provider)
4848
}
4949

5050
@BeforeClass

‎lib/src/main/kotlin/at/bitfire/vcard4android/AndroidAddressBook.kt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ import java.io.FileNotFoundException
1616
import java.util.*
1717

1818
open class AndroidAddressBook<T1: AndroidContact, T2: AndroidGroup>(
19-
var account: Account,
20-
val provider: ContentProviderClient?,
21-
protected val contactFactory: AndroidContactFactory<T1>,
22-
protected val groupFactory: AndroidGroupFactory<T2>
19+
var addressBookAccount: Account,
20+
val provider: ContentProviderClient?,
21+
protected val contactFactory: AndroidContactFactory<T1>,
22+
protected val groupFactory: AndroidGroupFactory<T2>
2323
) {
2424

2525
open var readOnly: Boolean = false
@@ -45,14 +45,14 @@ open class AndroidAddressBook<T1: AndroidContact, T2: AndroidGroup>(
4545
* @throws android.os.RemoteException on content provider errors
4646
*/
4747
set(values) {
48-
values.put(ContactsContract.Settings.ACCOUNT_NAME, account.name)
49-
values.put(ContactsContract.Settings.ACCOUNT_TYPE, account.type)
48+
values.put(ContactsContract.Settings.ACCOUNT_NAME, addressBookAccount.name)
49+
values.put(ContactsContract.Settings.ACCOUNT_TYPE, addressBookAccount.type)
5050
provider!!.insert(syncAdapterURI(ContactsContract.Settings.CONTENT_URI), values)
5151
}
5252

5353
var syncState: ByteArray?
54-
get() = ContactsContract.SyncState.get(provider, account)
55-
set(data) = ContactsContract.SyncState.set(provider, account, data)
54+
get() = ContactsContract.SyncState.get(provider, addressBookAccount)
55+
set(data) = ContactsContract.SyncState.set(provider, addressBookAccount, data)
5656

5757

5858
fun queryContacts(where: String?, whereArgs: Array<String>?): List<T1> {
@@ -85,7 +85,7 @@ open class AndroidAddressBook<T1: AndroidContact, T2: AndroidGroup>(
8585

8686

8787
fun allGroups(callback: (T2) -> Unit) {
88-
queryGroups("${Groups.ACCOUNT_TYPE}=? AND ${Groups.ACCOUNT_NAME}=?", arrayOf(account.type, account.name)) { group ->
88+
queryGroups("${Groups.ACCOUNT_TYPE}=? AND ${Groups.ACCOUNT_NAME}=?", arrayOf(addressBookAccount.type, addressBookAccount.name)) { group ->
8989
callback(group)
9090
}
9191
}
@@ -106,8 +106,8 @@ open class AndroidAddressBook<T1: AndroidContact, T2: AndroidGroup>(
106106

107107
fun syncAdapterURI(uri: Uri) = uri.buildUpon()
108108
.appendQueryParameter(ContactsContract.CALLER_IS_SYNCADAPTER, "true")
109-
.appendQueryParameter(RawContacts.ACCOUNT_NAME, account.name)
110-
.appendQueryParameter(RawContacts.ACCOUNT_TYPE, account.type)
109+
.appendQueryParameter(RawContacts.ACCOUNT_NAME, addressBookAccount.name)
110+
.appendQueryParameter(RawContacts.ACCOUNT_TYPE, addressBookAccount.type)
111111
.build()!!
112112

113113
fun rawContactsSyncUri() = syncAdapterURI(RawContacts.CONTENT_URI)

‎lib/src/main/kotlin/at/bitfire/vcard4android/AndroidContact.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ open class AndroidContact(
126126
id = ContentUris.parseId(resultUri)
127127

128128
getContact().photo?.let { photo ->
129-
PhotoBuilder.insertPhoto(provider, addressBook.account, id!!, photo)
129+
PhotoBuilder.insertPhoto(provider, addressBook.addressBookAccount, id!!, photo)
130130
}
131131

132132
return resultUri
@@ -158,7 +158,7 @@ open class AndroidContact(
158158
batch.commit()
159159

160160
getContact().photo?.let { photo ->
161-
PhotoBuilder.insertPhoto(provider, addressBook.account, id!!, photo)
161+
PhotoBuilder.insertPhoto(provider, addressBook.addressBookAccount, id!!, photo)
162162
}
163163

164164
return uri
@@ -177,8 +177,8 @@ open class AndroidContact(
177177
@CallSuper
178178
protected open fun buildContact(builder: BatchOperation.CpoBuilder, update: Boolean) {
179179
if (!update)
180-
builder .withValue(RawContacts.ACCOUNT_NAME, addressBook.account.name)
181-
.withValue(RawContacts.ACCOUNT_TYPE, addressBook.account.type)
180+
builder .withValue(RawContacts.ACCOUNT_NAME, addressBook.addressBookAccount.name)
181+
.withValue(RawContacts.ACCOUNT_TYPE, addressBook.addressBookAccount.type)
182182

183183
builder .withValue(RawContacts.DIRTY, 0)
184184
.withValue(RawContacts.DELETED, 0)

‎lib/src/main/kotlin/at/bitfire/vcard4android/AndroidGroup.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ open class AndroidGroup(
130130
*/
131131
fun add(): Uri {
132132
val values = contentValues()
133-
values.put(Groups.ACCOUNT_TYPE, addressBook.account.type)
134-
values.put(Groups.ACCOUNT_NAME, addressBook.account.name)
133+
values.put(Groups.ACCOUNT_TYPE, addressBook.addressBookAccount.type)
134+
values.put(Groups.ACCOUNT_NAME, addressBook.addressBookAccount.name)
135135
values.put(Groups.SHOULD_SYNC, 1)
136136
if (addressBook.readOnly)
137137
values.put(Groups.GROUP_IS_READ_ONLY, 1)

‎lib/src/main/kotlin/at/bitfire/vcard4android/Utils.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ object Utils {
3636
fun StructuredName.isEmpty() =
3737
prefixes.isEmpty() && given == null && additionalNames.isEmpty() && family == null && suffixes.isEmpty()
3838

39-
fun Uri.asSyncAdapter(account: Account): Uri = buildUpon()
40-
.appendQueryParameter(ContactsContract.RawContacts.ACCOUNT_NAME, account.name)
41-
.appendQueryParameter(ContactsContract.RawContacts.ACCOUNT_TYPE, account.type)
39+
fun Uri.asSyncAdapter(addressBookAccount: Account): Uri = buildUpon()
40+
.appendQueryParameter(ContactsContract.RawContacts.ACCOUNT_NAME, addressBookAccount.name)
41+
.appendQueryParameter(ContactsContract.RawContacts.ACCOUNT_TYPE, addressBookAccount.type)
4242
.appendQueryParameter(ContactsContract.CALLER_IS_SYNCADAPTER, "true")
4343
.build()
4444

‎lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/PhotoBuilder.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ class PhotoBuilder(dataRowUri: Uri, rawContactId: Long?, contact: Contact, readO
3535
* [RawContacts.DIRTY] flag may be set asynchronously by the contacts provider
3636
* as soon as it finishes the operation.
3737
*
38-
* @param provider client to access contacts provider
39-
* @param account account of the contact, used to create sync adapter URIs
40-
* @param rawContactId ID of the raw contact ([RawContacts._ID]])
41-
* @param data contact photo (binary data in a supported format like JPEG or PNG)
38+
* @param provider client to access contacts provider
39+
* @param addressBookAccount account of the contact, used to create sync adapter URIs
40+
* @param rawContactId ID of the raw contact ([RawContacts._ID]])
41+
* @param data contact photo (binary data in a supported format like JPEG or PNG)
4242
*
4343
* @return URI of the raw contact display photo ([Photo.PHOTO_URI]); null if image can't be decoded
4444
*/
45-
fun insertPhoto(provider: ContentProviderClient, account: Account, rawContactId: Long, data: ByteArray): Uri? {
45+
fun insertPhoto(provider: ContentProviderClient, addressBookAccount: Account, rawContactId: Long, data: ByteArray): Uri? {
4646
// verify that data can be decoded by BitmapFactory, so that the contacts provider can process it
4747
val opts = BitmapFactory.Options()
4848
opts.inJustDecodeBounds = true
@@ -90,7 +90,7 @@ class PhotoBuilder(dataRowUri: Uri, rawContactId: Long?, contact: Contact, readO
9090
// reset dirty flag in any case (however if we didn't wait long enough, the dirty flag will then be set again)
9191
val notDirty = ContentValues(1)
9292
notDirty.put(RawContacts.DIRTY, 0)
93-
val rawContactUri = ContentUris.withAppendedId(RawContacts.CONTENT_URI, rawContactId).asSyncAdapter(account)
93+
val rawContactUri = ContentUris.withAppendedId(RawContacts.CONTENT_URI, rawContactId).asSyncAdapter(addressBookAccount)
9494
provider.update(rawContactUri, notDirty, null, null)
9595

9696
if (photoUri != null)

0 commit comments

Comments
 (0)