From 750b234490de3e6270f48f358b8d20963eb418e2 Mon Sep 17 00:00:00 2001 From: Patrick Lang <72232737+patrickunterwegs@users.noreply.github.com> Date: Thu, 16 Jun 2022 18:04:20 +0200 Subject: Fixed missing color and url in jtx Bord sync (#43) * Fixed missing color and url in jtx Bord sync * Update test-dev.yml Updated jtx version --- .github/workflows/test-dev.yml | 2 +- src/main/java/at/bitfire/ical4android/JtxICalObject.kt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-dev.yml b/.github/workflows/test-dev.yml index 6e8f005..00dc614 100644 --- a/.github/workflows/test-dev.yml +++ b/.github/workflows/test-dev.yml @@ -55,7 +55,7 @@ jobs: mkdir apk && cd apk wget -q -O org.dmfs.tasks.apk https://f-droid.org/archive/org.dmfs.tasks_80800.apk && adb install org.dmfs.tasks.apk wget -q -O org.tasks.apk https://f-droid.org/archive/org.tasks_110701.apk && adb install org.tasks.apk - wget -q -O at.techbee.jtx.apk https://f-droid.org/repo/at.techbee.jtx_100130002.apk && adb install at.techbee.jtx.apk + wget -q -O at.techbee.jtx.apk https://f-droid.org/repo/at.techbee.jtx_101010013.apk && adb install at.techbee.jtx.apk cd .. - name: Run connected tests run: ./gradlew connectedCheck diff --git a/src/main/java/at/bitfire/ical4android/JtxICalObject.kt b/src/main/java/at/bitfire/ical4android/JtxICalObject.kt index ba8504a..cfaae2f 100644 --- a/src/main/java/at/bitfire/ical4android/JtxICalObject.kt +++ b/src/main/java/at/bitfire/ical4android/JtxICalObject.kt @@ -1353,6 +1353,8 @@ duration?.let(props::add) this.classification = newData.classification this.status = newData.status this.priority = newData.priority + this.color = newData.color + this.url = newData.url this.dtstart = newData.dtstart this.dtstartTimezone = newData.dtstartTimezone @@ -1580,6 +1582,8 @@ duration?.let(props::add) priority.let { values.put(JtxContract.JtxICalObject.PRIORITY, it) } values.put(JtxContract.JtxICalObject.ICALOBJECT_COLLECTIONID, collectionId) values.put(JtxContract.JtxICalObject.UID, uid) + values.put(JtxContract.JtxICalObject.COLOR, color) + values.put(JtxContract.JtxICalObject.URL, url) geoLat.let { values.put(JtxContract.JtxICalObject.GEO_LAT, it) } geoLong.let { values.put(JtxContract.JtxICalObject.GEO_LONG, it) } location.let { values.put(JtxContract.JtxICalObject.LOCATION, it) } -- cgit v1.2.3