Skip to content
This repository was archived by the owner on Jun 9, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/androidTest/java/at/bitfire/ical4android/AndroidEventTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import org.junit.Assert.*
import java.net.URI
import java.time.Duration
import java.time.Period
import java.util.TimeZone

class AndroidEventTest {

Expand Down Expand Up @@ -1269,6 +1268,16 @@ class AndroidEventTest {
}
}

@Test
fun testBuildUnknownProperty_NoValue() {
buildEvent(true) {
unknownProperties += XProperty("ATTACH", ParameterList(), null)
}.let { result ->
// The property should not have been added, so the first unknown property should be null
assertNull(firstUnknownProperty(result))
}
}

private fun firstException(values: ContentValues): ContentValues? {
val id = values.getAsInteger(Events._ID)
provider.query(Events.CONTENT_URI.asSyncAdapter(testAccount), null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import at.bitfire.ical4android.validation.FixInvalidUtcOffsetPreprocessor
import at.bitfire.ical4android.validation.ICalPreprocessor
import io.mockk.mockkObject
import io.mockk.verify
import java.io.InputStreamReader
import java.io.StringReader
import net.fortuna.ical4j.data.CalendarBuilder
import net.fortuna.ical4j.model.Component
import net.fortuna.ical4j.model.component.VEvent
import org.junit.Assert.assertEquals
import org.junit.Test
import java.io.InputStreamReader
import java.io.StringReader

class ICalPreprocessorTest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

package at.bitfire.ical4android

import java.time.ZoneOffset
import java.util.Locale
import net.fortuna.ical4j.model.property.TzOffsetFrom
import org.junit.AfterClass
import org.junit.Assert.assertEquals
import org.junit.BeforeClass
import org.junit.Test
import java.time.ZoneOffset
import java.util.*

class LocaleNonWesternDigitsTest {

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/at/bitfire/ical4android/AndroidEvent.kt
Original file line number Diff line number Diff line change
Expand Up @@ -990,6 +990,10 @@ abstract class AndroidEvent(
}

protected open fun insertUnknownProperty(batch: BatchOperation, idxEvent: Int?, property: Property) {
if (property.value == null) {
Ical4Android.log.warning("Ignoring unknown property with null value")
return
}
if (property.value.length > UnknownProperty.MAX_UNKNOWN_PROPERTY_SIZE) {
Ical4Android.log.warning("Ignoring unknown property with ${property.value.length} octets (too long)")
return
Expand Down