Skip to content

Update to work with desktop 2.1.54 code#11644

Merged
mikehardy merged 20 commits into
ankidroid:mainfrom
ankitects:new-anki2
Jun 29, 2022
Merged

Update to work with desktop 2.1.54 code#11644
mikehardy merged 20 commits into
ankidroid:mainfrom
ankitects:new-anki2

Conversation

@dae

@dae dae commented Jun 16, 2022

Copy link
Copy Markdown
Contributor

Depends on ankidroid/Anki-Android-Backend#202

Due to the removal and change of a few backend methods, syncing, importing
and the card templates screen will not work when the schema16 setting is
active (actually schema18 now). To get them working again, those code
paths will need to switch to the backend implementations.

A few notes:

  • Downgrading happens automatically when loading the collection in schema11
    mode, so the extra code dealing with downgrades & "can downgrade" reporting
    can be stripped.
  • Added the ability to run col.set_config("key", JSONObject.NULL), as
    unit tests were attempting to write the entire collection config to accomplish
    this, which is no longer supported.
  • All tests pass on both old and new backends, though the latter required
    disabling a few failed tests when running with the new schema
    (eg notetype updating).

Integrates, and thus closes #11579 and closes #11581
Closes #11559

@dae

This comment was marked as resolved.

@mikehardy

This comment was marked as resolved.

@mikehardy mikehardy requested a review from david-allison June 18, 2022 15:39
@mikehardy

This comment was marked as resolved.

@dae

This comment was marked as resolved.

@dae

This comment was marked as resolved.

@mikehardy

This comment was marked as resolved.

@thedroiddiv

This comment was marked as resolved.

dae added a commit to ankitects/Anki-Android that referenced this pull request Jun 21, 2022
If a non-Robolectric test happens to run first in a process, subsequent
Robolectric tests in that process will fail.

ankidroid#11644 (comment)
dae added a commit to ankitects/Anki-Android that referenced this pull request Jun 25, 2022
If a non-Robolectric test happens to run first in a process, subsequent
Robolectric tests in that process will fail.

ankidroid#11644 (comment)
@dae dae force-pushed the new-anki2 branch 2 times, most recently from 0384f0c to 5f05618 Compare June 25, 2022 03:41
@dae dae marked this pull request as ready for review June 25, 2022 07:07
@mikehardy

This comment was marked as resolved.

@mikehardy

This comment was marked as resolved.

@dae dae force-pushed the new-anki2 branch 2 times, most recently from a0379c5 to 129dfee Compare June 25, 2022 23:29
dae added a commit to ankitects/Anki-Android that referenced this pull request Jun 25, 2022
If a non-Robolectric test happens to run first in a process, subsequent
Robolectric tests in that process will fail.

ankidroid#11644 (comment)
@mikehardy mikehardy deleted the new-anki2 branch June 29, 2022 16:12
@mikehardy

Copy link
Copy Markdown
Member

Wow, what an odyssey, but all in a good way. @dae, thank you 🤜 🤛 - really cool to be on up to date anki code and have a such a solid base for future work

@david-allison

david-allison commented Jun 29, 2022

Copy link
Copy Markdown
Member

YESS!!! Thank you!

@dae

dae commented Jun 29, 2022

Copy link
Copy Markdown
Contributor Author

Thanks for all the hard work on pushing this through guys. I'm preparing a follow-up PR that will address some of the posted issues.

@mikehardy

Copy link
Copy Markdown
Member

I'm headed out for some family travels end of this week through mid-August so I won't be able to push nearly that hard (if at all?) for a while but I'll try to keep an eye out and will hit any green github web UI buttons that look good to hit :-)

dae added a commit to ankitects/Anki-Android that referenced this pull request Jun 30, 2022
dae added a commit to ankitects/Anki-Android that referenced this pull request Jun 30, 2022
* Construct a search string from the provided search nodes. For example:
* */
/*
import anki.search.searchNode

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot for this clear documentation. Clearly useful, not only to understand ow to call the function, but also to find out where to search for the different values, given that they are not directly in our codebase so can't be find by a standard search

dae added a commit to ankitects/Anki-Android that referenced this pull request Jul 6, 2022
dae added a commit to ankitects/Anki-Android that referenced this pull request Jul 6, 2022
dae added a commit to ankitects/Anki-Android that referenced this pull request Jul 6, 2022
dae added a commit to ankitects/Anki-Android that referenced this pull request Jul 6, 2022
dae added a commit to ankitects/Anki-Android that referenced this pull request Jul 11, 2022
dae added a commit to ankitects/Anki-Android that referenced this pull request Jul 11, 2022
dae added a commit to ankitects/Anki-Android that referenced this pull request Jul 16, 2022
dae added a commit to ankitects/Anki-Android that referenced this pull request Jul 16, 2022
dae added a commit to ankitects/Anki-Android that referenced this pull request Jul 18, 2022
dae added a commit to ankitects/Anki-Android that referenced this pull request Jul 18, 2022
mikehardy pushed a commit that referenced this pull request Jul 22, 2022
mikehardy pushed a commit that referenced this pull request Jul 22, 2022
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.

5 participants