Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/bitfireAT/ical4android.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Lang <72232737+patrickunterwegs@users.noreply.github.com>2022-06-16 19:04:20 +0300
committerGitHub <noreply@github.com>2022-06-16 19:04:20 +0300
commit750b234490de3e6270f48f358b8d20963eb418e2 (patch)
tree84fe7e676c96c3fe0988eda63b8474d616bde393
parent357a9e3a1d51c690c736436d5d42f74925bf471c (diff)
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
-rw-r--r--.github/workflows/test-dev.yml2
-rw-r--r--src/main/java/at/bitfire/ical4android/JtxICalObject.kt4
2 files changed, 5 insertions, 1 deletions
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) }