Commit 4051bc2e authored by Ricki Hirner's avatar Ricki Hirner 🐑

Update cert4android; SDK target level 29

parent 8f6f492f
Pipeline #83053308 passed with stage
in 3 minutes and 16 seconds
......@@ -12,13 +12,13 @@ apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'
android {
compileSdkVersion 28
compileSdkVersion 29
buildToolsVersion '29.0.1'
defaultConfig {
applicationId "at.bitfire.icsdroid"
minSdkVersion 19
targetSdkVersion 28
targetSdkVersion 29
multiDexEnabled true // >64k methods for Android 4.4
versionCode 39
......
......@@ -125,7 +125,7 @@ class LocalCalendar private constructor(
try {
provider.query(syncAdapterURI(Events.CONTENT_URI, account),
arrayOf(Events._ID, Events._SYNC_ID, Events.ORIGINAL_SYNC_ID),
"${Events.CALENDAR_ID}=? AND ${Events.ORIGINAL_SYNC_ID} IS NULL", arrayOf(id.toString()), null).use { row ->
"${Events.CALENDAR_ID}=? AND ${Events.ORIGINAL_SYNC_ID} IS NULL", arrayOf(id.toString()), null)?.use { row ->
while (row.moveToNext()) {
val eventId = row.getLong(0)
val syncId = row.getString(1)
......
......@@ -252,7 +252,7 @@ class CalendarListActivity:
context: Context
): ArrayAdapter<LocalCalendar>(context, R.layout.calendar_list_item) {
override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View {
override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
val v = convertView ?:
LayoutInflater.from(context).inflate(R.layout.calendar_list_item, parent, false)
......
Subproject commit 8ad6a3db2fcd1e1ee6cf8e116fc5f69d904ad108
Subproject commit 50aa218a1cde086fdd024d25c34f17d9f352d3c2
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment