Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix migrations #133

Merged
merged 16 commits into from
Feb 28, 2023
Merged

Fix migrations #133

merged 16 commits into from
Feb 28, 2023

Conversation

ArnyminerZ
Copy link
Member

See #129

@ArnyminerZ
Added calendar id to subscription
17e213a 
Signed-off-by: Arnau Mora <arnyminer.z@gmail.com>
@ArnyminerZ ArnyminerZ added the bug Something isn't working label Feb 27, 2023
@ArnyminerZ ArnyminerZ self-assigned this Feb 27, 2023
@ArnyminerZ ArnyminerZ mentioned this pull request Feb 28, 2023
Closed
@rfc2822
Copy link
Member

rfc2822 commented Feb 28, 2023

(I have added a commit that uses a specific UPDATE instead of copy constructors to avoid copying around data without need.)

Yes the concept looks good, now only the finishing :)

The calendars are now a Map<calendar ID, LocalCalendar> – I think we can't do remove(subscription.id) because they key is not a subscription ID but a calendar ID.

So calendar IDs and subscription IDs have to separated properly and if it gets complicated maybe one or two lines of commit would be OK.

@ArnyminerZ
Copy link
Member Author

The calendars are now a Map<calendar ID, LocalCalendar> – I think we can't do remove(subscription.id) because they key is not a subscription ID but a calendar ID.

Yup, you are right

@ArnyminerZ
Fixed calendar id removal
80b45e4 
Signed-off-by: Arnau Mora <arnyminer.z@gmail.com>
@ArnyminerZ
Fixed calendar matching
daaa22e 
Signed-off-by: Arnau Mora <arnyminer.z@gmail.com>
@ArnyminerZ
Added url to calendar properties
3a84525 
Signed-off-by: Arnau Mora <arnyminer.z@gmail.com>
@ArnyminerZ
Fixed calendar id find
1fc0cab 
Signed-off-by: Arnau Mora <arnyminer.z@gmail.com>
@ArnyminerZ ArnyminerZ mentioned this pull request Feb 28, 2023
Closed
@ArnyminerZ
Copy link
Member Author

ArnyminerZ commented Feb 28, 2023 •
edited

This should be ready. We still have the problem of #134, but I'd open a new PR for that one.

@ArnyminerZ ArnyminerZ marked this pull request as ready for review February 28, 2023 10:32
@ArnyminerZ
Fixed test
669780b 
Signed-off-by: Arnau Mora <arnyminer.z@gmail.com>
@ArnyminerZ
Fixed subscription id fetching
af0c046 
Signed-off-by: Arnau Mora <arnyminer.z@gmail.com>
@rfc2822 rfc2822 linked an issue Feb 28, 2023 that may be closed by this pull request
Content Provider returning null when trying to insert new calendars #129
Closed
@rfc2822 rfc2822 self-assigned this Feb 28, 2023
@rfc2822 rfc2822 added this to the 2.1.1 milestone Feb 28, 2023
@rfc2822 rfc2822 removed their request for review February 28, 2023 12:48
@rfc2822 rfc2822 marked this pull request as draft February 28, 2023 12:49
@rfc2822 rfc2822 changed the title Added calendar id to subscription Fix migrations Feb 28, 2023
@rfc2822 rfc2822 marked this pull request as ready for review February 28, 2023 18:49
@rfc2822 rfc2822 merged commit 606960e into dev Feb 28, 2023
@rfc2822 rfc2822 deleted the calendar_id branch February 28, 2023 19:04
yan12125 added a commit to yan12125/icsx5 that referenced this pull request Apr 6, 2023
@yan12125
Add back fixes introduced in bitfireAT#133
292b07d
yan12125 added a commit to yan12125/icsx5 that referenced this pull request Apr 7, 2023
@yan12125
Add back fixes introduced in bitfireAT#133
46b4310
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@rfc2822 rfc2822

Labels
bug Something isn't working
Projects
None yet
Milestone
2.1.1
Development

Successfully merging this pull request may close these issues.

Content Provider returning null when trying to insert new calendars
2 participants
@ArnyminerZ @rfc2822