Also considering now value == "true" to retrieve Boolean from string (just to be sure) (#64)

3 files changed, 8 insertions, 4 deletions

diff --git a/src/androidTest/java/at/bitfire/ical4android/JtxICalObjectTest.kt b/src/androidTest/java/at/bitfire/ical4android/JtxICalObjectTest.kt
index 2632e2a..8cf65ba 100644
--- a/src/androidTest/java/at/bitfire/ical4android/JtxICalObjectTest.kt
+++ b/src/androidTest/java/at/bitfire/ical4android/JtxICalObjectTest.kt
@@ -199,7 +199,7 @@ class JtxICalObjectTest {
             it.moveToFirst()
             DatabaseUtils.cursorRowToContentValues(it, itemCV)
             val retrievedFieldContent = itemCV.getAsString(field)
-            val retrievedFieldBoolean = retrievedFieldContent == "1"
+            val retrievedFieldBoolean = retrievedFieldContent == "1" || retrievedFieldContent == "true"
             assertEquals(fieldContent, retrievedFieldBoolean)
         }
     }
@@ -383,7 +383,8 @@ class JtxICalObjectTest {
             assertEquals(attendee.member, retrievedAttendeeCV.getAsString(JtxContract.JtxAttendee.MEMBER))
             assertEquals(attendee.partstat, retrievedAttendeeCV.getAsString(JtxContract.JtxAttendee.PARTSTAT))
             assertEquals(attendee.role, retrievedAttendeeCV.getAsString(JtxContract.JtxAttendee.ROLE))
-            assertEquals(attendee.rsvp, retrievedAttendeeCV.getAsString(JtxContract.JtxAttendee.RSVP) == "1")
+            assertEquals(attendee.rsvp, retrievedAttendeeCV.getAsString(JtxContract.JtxAttendee.RSVP) == "1"
+                    || retrievedAttendeeCV.getAsString(JtxContract.JtxAttendee.RSVP) == "true")
             assertEquals(attendee.delegatedfrom, retrievedAttendeeCV.getAsString(JtxContract.JtxAttendee.DELEGATEDFROM))
             assertEquals(attendee.delegatedto, retrievedAttendeeCV.getAsString(JtxContract.JtxAttendee.DELEGATEDTO))
             assertEquals(attendee.sentby, retrievedAttendeeCV.getAsString(JtxContract.JtxAttendee.SENTBY))
diff --git a/src/main/java/at/bitfire/ical4android/JtxCollection.kt b/src/main/java/at/bitfire/ical4android/JtxCollection.kt
index 60b3339..8822b94 100644
--- a/src/main/java/at/bitfire/ical4android/JtxCollection.kt
+++ b/src/main/java/at/bitfire/ical4android/JtxCollection.kt
@@ -69,8 +69,11 @@ open class JtxCollection<out T: JtxICalObject>(val account: Account,
         syncstate = values.getAsString(JtxContract.JtxCollection.SYNC_VERSION)
 
         supportsVEVENT = values.getAsString(JtxContract.JtxCollection.SUPPORTSVEVENT) == "1"
+                || values.getAsString(JtxContract.JtxCollection.SUPPORTSVEVENT) == "true"
         supportsVTODO = values.getAsString(JtxContract.JtxCollection.SUPPORTSVTODO) == "1"
+                || values.getAsString(JtxContract.JtxCollection.SUPPORTSVTODO) == "true"
         supportsVJOURNAL = values.getAsString(JtxContract.JtxCollection.SUPPORTSVJOURNAL) == "1"
+                || values.getAsString(JtxContract.JtxCollection.SUPPORTSVJOURNAL) == "true"
 
         this.context = context
     }
diff --git a/src/main/java/at/bitfire/ical4android/JtxICalObject.kt b/src/main/java/at/bitfire/ical4android/JtxICalObject.kt
index 6c74078..bc3cc22 100644
--- a/src/main/java/at/bitfire/ical4android/JtxICalObject.kt
+++ b/src/main/java/at/bitfire/ical4android/JtxICalObject.kt
@@ -1435,8 +1435,8 @@ duration?.let(props::add)
             values.getAsString(JtxContract.JtxICalObject.RECURID)?.let { recurid -> this.recurid = recurid }
 
             this.collectionId = collection.id
-            values.getAsString(JtxContract.JtxICalObject.DIRTY)?.let { dirty -> this.dirty = dirty == "1" }
-            values.getAsString(JtxContract.JtxICalObject.DELETED)?.let { deleted -> this.deleted = deleted == "1" }
+            values.getAsString(JtxContract.JtxICalObject.DIRTY)?.let { dirty -> this.dirty = dirty == "1" || dirty == "true" }
+            values.getAsString(JtxContract.JtxICalObject.DELETED)?.let { deleted -> this.deleted = deleted == "1" || deleted == "true" }
 
             values.getAsString(JtxContract.JtxICalObject.FILENAME)?.let { fileName -> this.fileName = fileName }
             values.getAsString(JtxContract.JtxICalObject.ETAG)?.let { eTag -> this.eTag = eTag }