Skip to content

Merge upstream changes #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 100 commits into
base: tasks
Choose a base branch
from
Draft

Conversation

devn1x
Copy link

@devn1x devn1x commented Jun 23, 2025

This pull request was recreated(#2), to clean up the branch structure a little bit.

This would be step two of tasks/tasks#2870 and it seems to compile at least. I managed to fix the error I was stuck on before just like you did previously. I think this update has some potential to break things, but I don't know how much. It would make sense to test this thoroughly.

ArnyminerZ and others added 30 commits February 8, 2023 11:01
* Improved test

Signed-off-by: Arnau Mora <[email protected]>

* Added more fix cases

Signed-off-by: Arnau Mora <[email protected]>

* Use assert signature

---------

Signed-off-by: Arnau Mora <[email protected]>
Co-authored-by: Ricki Hirner <[email protected]>
* Including recur instances in generated ics

* Exclude recur instances from query dirty and query deleted
code format updates
removed deprecated method updateRelatedTo()

* Fixed bug in recuid handling on ical generation

* added queryRecur(...) and excluded recur instances when using query by filename

* updated getICSForCollection() to exclude unchanged recur instances

* updated minVersion for jtx Board

* Fixed:  export all from collection includes the recurring instances twice
Added owner displayname
* Updated ical4j to `3.2.10`

Signed-off-by: Arnau Mora <[email protected]>

* Removed not needed test

Signed-off-by: Arnau Mora <[email protected]>

* Recovered persian test case

Signed-off-by: Arnau Mora <[email protected]>

---------

Signed-off-by: Arnau Mora <[email protected]>
* Updated ical4j to `3.2.9`

Signed-off-by: Arnau Mora <[email protected]>

* Enabled suppress invalid properties

Signed-off-by: Arnau Mora <[email protected]>

* Added test with event with invalid property

Signed-off-by: Arnau Mora <[email protected]>

* Changed invalid geo test ical

Signed-off-by: Arnau Mora <[email protected]>

* Removed trailing comma

Signed-off-by: Arnau Mora <[email protected]>

* Removed old comment

Signed-off-by: Arnau Mora <[email protected]>

* Compressed `invalid-geo.ics` into `testFromReader_invalidProperty`

Signed-off-by: Arnau Mora <[email protected]>

* Add comment for test

---------

Signed-off-by: Arnau Mora <[email protected]>
Co-authored-by: Ricki Hirner <[email protected]>
* Fixed invalid day offset parsing (closes bitfireAT#77)

Signed-off-by: Arnau Mora <[email protected]>

* Strengthened tests for `FixInvalidDayOffsetPreprocessor`

Signed-off-by: Arnau Mora <[email protected]>

* Optimized imports

Signed-off-by: Arnau Mora <[email protected]>

* Use mockk to mock objects; ICalPreprocessorTest: test stream processor application

* Added ICS test

Signed-off-by: Arnau Mora <[email protected]>

* Removed ICS test

Signed-off-by: Arnau Mora <[email protected]>

* Added multiple durations test

Signed-off-by: Arnau Mora <[email protected]>

* Rename methods and add clarifying comments

---------

Signed-off-by: Arnau Mora <[email protected]>
Co-authored-by: Ricki Hirner <[email protected]>
Co-authored-by: Sunik Kupfer <[email protected]>
…T#89)

Fixes bitfireAT#88

* Added handler for properties with null value when inserting

Signed-off-by: Arnau Mora <[email protected]>

* Added test for checking ignored attach with invalid encoding

Signed-off-by: Arnau Mora <[email protected]>

* Removed test

Signed-off-by: Arnau Mora <[email protected]>

* Added test for unknown properties with null value

Signed-off-by: Arnau Mora <[email protected]>

* Optimize imports

---------

Signed-off-by: Arnau Mora <[email protected]>
Co-authored-by: Ricki Hirner <[email protected]>
* Updated timezone checks

Signed-off-by: Arnau Mora <[email protected]>

* Renamed variable

Signed-off-by: Arnau Mora <[email protected]>

* Changed regex to equals

Signed-off-by: Arnau Mora <[email protected]>

---------

Signed-off-by: Arnau Mora <[email protected]>
…tfireAT#96)

* Improve build speed by enabling gradle configuration cache

* Added rules for fixing Dublin timezone

Signed-off-by: Arnau Mora <[email protected]>

* Added rules for fixing Dublin timezone

Signed-off-by: Arnau Mora <[email protected]>

* Added test for Dublin preprocessing

Signed-off-by: Arnau Mora <[email protected]>

* Applying rules for properties and components

Signed-off-by: Arnau Mora <[email protected]>

* Added test for `testTzDublin_external`

Signed-off-by: Arnau Mora <[email protected]>

* Changed rule replacement method

Signed-off-by: Arnau Mora <[email protected]>

* Use ValidatingTimeZoneRegistry to ignore time zone updates that can't be handled properly by ical4j

* Rollback

Signed-off-by: Arnau Mora Gras <[email protected]>

* Enable ical4j flag to support timezone definitions with negative DST

* Optimize imports

* Remove duplicate test

---------

Signed-off-by: Arnau Mora <[email protected]>
Signed-off-by: Arnau Mora Gras <[email protected]>
Co-authored-by: Arnau Mora <[email protected]>
* Added geofence radius x-property

* updated tests

* Update JtxICalObjectTest.kt

* Update JtxICalObjectTest.kt
Updated minVersion for jtx
* Added recuridTimezone and adapted logic for RecurrenceId

* minor code improvement
* Moved files to module

Signed-off-by: Arnau Mora Gras <[email protected]>

* Configured modules

Signed-off-by: Arnau Mora Gras <[email protected]>

* Fixed paths

Signed-off-by: Arnau Mora Gras <[email protected]>

* Configured Jitpack

Signed-off-by: Arnau Mora Gras <[email protected]>

* Updated usage instructions

Signed-off-by: Arnau Mora Gras <[email protected]>

* Config for `maven-publish`

Signed-off-by: Arnau Mora Gras <[email protected]>

* typo

Signed-off-by: Arnau Mora <[email protected]>

* Deprecations

Signed-off-by: Arnau Mora <[email protected]>

* Using environment variable for version

Signed-off-by: Arnau Mora <[email protected]>

* Excluded `META-INF/INDEX.LIST`

Signed-off-by: Arnau Mora <[email protected]>

* Included `META-INF/INDEX.LIST` again

Signed-off-by: Arnau Mora <[email protected]>

* Excluded dateutils

Signed-off-by: Arnau Mora <[email protected]>

* Excluded all groovy trans. dependencies

Signed-off-by: Arnau Mora <[email protected]>

* Excluded groovy with configurations

Signed-off-by: Arnau Mora <[email protected]>

* Removed transitive dependencies

Signed-off-by: Arnau Mora <[email protected]>

* Minor changes, rename source directories from java to kotlin

---------

Signed-off-by: Arnau Mora Gras <[email protected]>
Signed-off-by: Arnau Mora <[email protected]>
Co-authored-by: Ricki Hirner <[email protected]>
* Extend removeEmptyStrings to remove blank strings as well

* Apply removeEmptyAndBlankStrings to populateTask()

* Move removeBlankStrings() to extension method; minor changes

* Minor MiscUtils restructurizing

---------

Co-authored-by: Ricki Hirner <[email protected]>
* Updated AGP to 8.1.0 and Kotlin to 1.9.0

Signed-off-by: Arnau Mora <[email protected]>

* Set Dokka to latest version

Signed-off-by: Arnau Mora <[email protected]>

---------

Signed-off-by: Arnau Mora <[email protected]>
…r provider exception (bitfireAT#114)

* Ignore RDATEs when there's an also an infinite RRULE to avoid calendar provider exception

* Added test

Signed-off-by: Arnau Mora <[email protected]>

* Tighten test intention

* Remove unused import directive

---------

Signed-off-by: Arnau Mora <[email protected]>
Co-authored-by: Arnau Mora <[email protected]>
Co-authored-by: Sunik Kupfer <[email protected]>
rfc2822 and others added 23 commits October 14, 2024 17:39
* Upgraded AGP to `8.7.1`

Signed-off-by: Arnau Mora Gras <[email protected]>

* Increase compile sdk to 35

Signed-off-by: Arnau Mora Gras <[email protected]>

* Made `installedVersionName` nullable

Signed-off-by: Arnau Mora Gras <[email protected]>

---------

Signed-off-by: Arnau Mora Gras <[email protected]>
* Add test

* Allow duration as value

* Restrict the regex to properties that can have DURATION as a value

* Tighten regex further

* Convert negative asserts (not equals) to positive asserts (test for what is expected)

* Test KDoc

* Use capturing group; Add comments

* Use replaceRange

---------

Co-authored-by: Ricki Hirner <[email protected]>
…#188)

* BatchOperation: set "yield allowed" after every 500 operations

* Only use "max. operations per yield point" for tasks.org/OpenTasks operations
* Filtered RDATE and EXDATE from exceptions

* Also test for empty RDATE and EXDATE

---------

Co-authored-by: Ricki Hirner <[email protected]>
* Added sync_id column in JtxContract

* Raise minimum jtx Board version

* AndroidCalendar, JtxCollection: add syncId column

---------

Co-authored-by: Ricki Hirner <[email protected]>
* Add queryRecur test

* Query without dtstart

* Correct log message

* Edit kdoc
…14.0; don't set strict version for commons anymore
* Remove thread context class loader checks and remove Ical4Android class

* Add test for ical4j ServiceLoader without per-thread context class loader
* Check cursor has next value

* Use getColumnIndexOrThrow for clarity

* Fix linting
# Conflicts:
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
#	lib/src/main/kotlin/at/bitfire/ical4android/BatchOperation.kt
#	lib/src/main/kotlin/at/bitfire/ical4android/DmfsTask.kt
#	lib/src/main/kotlin/at/bitfire/ical4android/Task.kt
@devn1x devn1x mentioned this pull request Jun 23, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants