diff options
| author | Ricki Hirner <hirner@bitfire.at> | 2021-10-04 12:19:21 +0300 |
|---|---|---|
| committer | Ricki Hirner <hirner@bitfire.at> | 2021-10-04 12:19:21 +0300 |
| commit | 54b7e6f8eefa30e6b4be5dd67308ebcfdda0c8f3 (patch) | |
| tree | fbd7355bc8758888c4b47ab5974786b2232e7dd6 | |
| parent | 162047dda5b4233ee4aaee9e9f6b45692656a443 (diff) | |
Minor update of dependencies and annotations
| -rw-r--r-- | build.gradle | 4 | ||||
| -rw-r--r-- | src/main/java/at/bitfire/vcard4android/AndroidAddressBook.kt | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/build.gradle b/build.gradle index d51350e..7f42070 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ buildscript { ext.versions = [ - kotlin: '1.5.21', + kotlin: '1.5.31', dokka: '1.5.0', // latest Apache Commons versions that don't require Java 8 (Android 7) commonsIO: '2.6', @@ -14,7 +14,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.0.1' + classpath 'com.android.tools.build:gradle:7.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}" } diff --git a/src/main/java/at/bitfire/vcard4android/AndroidAddressBook.kt b/src/main/java/at/bitfire/vcard4android/AndroidAddressBook.kt index af0c1d6..c534ede 100644 --- a/src/main/java/at/bitfire/vcard4android/AndroidAddressBook.kt +++ b/src/main/java/at/bitfire/vcard4android/AndroidAddressBook.kt @@ -18,6 +18,7 @@ import android.provider.ContactsContract.RawContacts import at.bitfire.vcard4android.Utils.toContentValues import java.io.FileNotFoundException import java.util.* +import kotlin.jvm.Throws open class AndroidAddressBook<T1: AndroidContact, T2: AndroidGroup>( var account: Account, @@ -80,12 +81,14 @@ open class AndroidAddressBook<T1: AndroidContact, T2: AndroidGroup>( return groups } + @Throws(FileNotFoundException::class) fun findContactById(id: Long) = queryContacts("${RawContacts._ID}=?", arrayOf(id.toString())).firstOrNull() ?: throw FileNotFoundException() fun findContactByUid(uid: String) = queryContacts("${AndroidContact.COLUMN_UID}=?", arrayOf(uid)).firstOrNull() + @Throws(FileNotFoundException::class) fun findGroupById(id: Long) = queryGroups("${Groups._ID}=?", arrayOf(id.toString())).firstOrNull() ?: throw FileNotFoundException() |