* build(deps): ignore commons-compress below 1.25 now
We are still not minSdkVersion >= API26 so we may not advance this
dependency yet, we just notch this forward one version at a time
so we continue to be aware of their releases, but ignore them for now
* build(deps): bump androidx.annotation:annotation from 1.6.0 to 1.7.0
Bumps androidx.annotation:annotation from 1.6.0 to 1.7.0.
---
updated-dependencies:
- dependency-name: androidx.annotation:annotation
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* build(deps): bump com.google.protobuf:protobuf-kotlin-lite
Bumps com.google.protobuf:protobuf-kotlin-lite from 3.24.2 to 3.24.3.
---
updated-dependencies:
- dependency-name: com.google.protobuf:protobuf-kotlin-lite
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
* build(deps): bump org.jlleitschuh.gradle.ktlint from 11.5.1 to 11.6.0
Bumps org.jlleitschuh.gradle.ktlint from 11.5.1 to 11.6.0.
---
updated-dependencies:
- dependency-name: org.jlleitschuh.gradle.ktlint
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* build(deps): bump com.google.protobuf:protobuf-kotlin-lite
Bumps com.google.protobuf:protobuf-kotlin-lite from 3.24.3 to 3.24.4.
---
updated-dependencies:
- dependency-name: com.google.protobuf:protobuf-kotlin-lite
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
* build(deps): bump commons-io:commons-io from 2.13.0 to 2.14.0
Bumps commons-io:commons-io from 2.13.0 to 2.14.0.
---
updated-dependencies:
- dependency-name: commons-io:commons-io
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* build(deps): bump io.mockk:mockk from 1.13.7 to 1.13.8
Bumps [io.mockk:mockk](https://github.com/mockk/mockk) from 1.13.7 to 1.13.8.
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.13.7...1.13.8)
---
updated-dependencies:
- dependency-name: io.mockk:mockk
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
* Update Gradle Wrapper from 8.3 to 8.4.
Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
* Only split APK build by ABI in release builds
This avoids the upstream android gradle plugin issue introduced in
AGPv8.1.2 (and seemingly fixed in AGBv8.3.0-alpha07) where doing
an ABI split while including resources crashes the build:
https://issuetracker.google.com/issues/302961829
If this causes problems or is distasteful, can be reverted when
AGP v8.3+ is adopted, or if they do pick it to AGPv8.2+, at that time
* Adopt android gradle plugin v8.1.2
* ignore dynamic receiver registrations without export-type specified
these receivers *should* specify at registration whether they are for export
or not for export but if that is added (such as in PR 14158) then there is also
a need to add a new permission to the manifest or you get runtime errors, and
we haven't figured that out yet
* build(deps): bump org.jetbrains.dokka from 1.9.0 to 1.9.10
Bumps [org.jetbrains.dokka](https://github.com/Kotlin/dokka) from 1.9.0 to 1.9.10.
- [Release notes](https://github.com/Kotlin/dokka/releases)
- [Commits](https://github.com/Kotlin/dokka/compare/v1.9.0...v1.9.10)
---
updated-dependencies:
- dependency-name: org.jetbrains.dokka
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
* build(deps): bump com.squareup.okhttp3:okhttp from 4.11.0 to 4.12.0
Bumps [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) from 4.11.0 to 4.12.0.
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.11.0...parent-4.12.0)
---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* build(deps): bump org.jlleitschuh.gradle.ktlint from 11.6.0 to 11.6.1
Bumps org.jlleitschuh.gradle.ktlint from 11.6.0 to 11.6.1.
---
updated-dependencies:
- dependency-name: org.jlleitschuh.gradle.ktlint
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
* Bump compileSdk to 34, handle new deprecations (#14556)
* Bump compileSdk to 34
* Alter system API overrides to handle newly nullable items in API34
Investigating the various changes led me to conclude that simple null
checks and default returns if null was an adequate response to the
newly-possible null case in the various parameters
* API34 deprecates Class.newInstance, get ctor and newInstance that instead
* use new API34 pixel calc style if available
this apparently allows for finer more dynamic user text sizing
* Temporarily suppress deprecation on animation overrides
API34 adds new predictive back behavior, which implies that the
transition animation overrides for activity stack change animations
now need to know whether the animation override is for activity open or
close, whereas we override both as a unit without thought
This needs a solution before the deprecated methods go away, likely in
the form of plumbing through (via a new parameter) the idea of whether
the call site intended to override open, close, or both animations. For
backwards compatibility this will likely need to be a Compat interface
(or interfaces) to replace the current implementation
* build(deps): bump androidx.webkit:webkit from 1.7.0 to 1.8.0
Bumps androidx.webkit:webkit from 1.7.0 to 1.8.0.
---
updated-dependencies:
- dependency-name: androidx.webkit:webkit
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* build(deps): bump androidx.browser:browser from 1.5.0 to 1.6.0
Bumps androidx.browser:browser from 1.5.0 to 1.6.0.
---
updated-dependencies:
- dependency-name: androidx.browser:browser
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* build(deps): bump androidx.activity:activity-ktx from 1.7.2 to 1.8.0 (#14515)
* build(deps): bump androidx.activity:activity-ktx from 1.7.2 to 1.8.0
Bumps androidx.activity:activity-ktx from 1.7.2 to 1.8.0.
---
updated-dependencies:
- dependency-name: androidx.activity:activity-ktx
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* call super.onBackPressed in onBackPressed overrides
This is more "predictive back" feature fallout, this commit should be examined,
and the behavior in these 4 objects may need a change, in order to more correctly
deal with API34 predictive back
---------
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mike Hardy <github@mikehardy.net>
* build(deps): bump androidx.recyclerview:recyclerview from 1.3.1 to 1.3.2
Bumps androidx.recyclerview:recyclerview from 1.3.1 to 1.3.2.
---
updated-dependencies:
- dependency-name: androidx.recyclerview:recyclerview
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
* build(deps): bump androidx.core:core-ktx from 1.10.1 to 1.12.0 (#14407)
* build(deps): bump androidx.core:core-ktx from 1.10.1 to 1.12.0
Bumps androidx.core:core-ktx from 1.10.1 to 1.12.0.
---
updated-dependencies:
- dependency-name: androidx.core:core-ktx
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* PendingIntentCompat.getBroadcast() is nullable now, wrap use of result in null checks
It will only return null if we specify intent flags which we never specify, so our behavior
does not need to change, but we must respect the type system by wrapping the use of the now-nullable
result in null checks
---------
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mike Hardy <github@mikehardy.net>
* build(deps): bump androidx.sqlite:sqlite-framework from 2.3.1 to 2.4.0
Bumps androidx.sqlite:sqlite-framework from 2.3.1 to 2.4.0.
---
updated-dependencies:
- dependency-name: androidx.sqlite:sqlite-framework
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* build(deps): bump androidx.appcompat:appcompat
Bumps androidx.appcompat:appcompat from 1.7.0-alpha02 to 1.7.0-alpha03.
---
updated-dependencies:
- dependency-name: androidx.appcompat:appcompat
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
---------
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: gradle-update-robot <gradle-update-robot@regolo.cc>
* Update target API to 23
* Update to 2.1.66, and switch to new schema by default
+ Temporarily disable unused resource warnings
* Drop legacy syncing code
* Drop legacy import/export code
* Drop legacy tag handling
* Drop legacy config handling
* Drop legacy database check
* Stub out unused v1 scheduler code
Can't be fully removed, as we still need to be able to open a v1 collection
so the user can upgrade.
moveVersions test has been removed, as backend code is used for moving
outside of unit tests.
* Drop legacy deck handling
* Drop legacy search code
* Drop legacy notetype code
This breaks the card template editor, so I've temporarily disabled it
in the GUI. Getting it working again will require switching to the new
template rendering code in the new backend.
Also breaks an "empty cards" action in CardContentProvider,
as I was not sure what it was trying to accomplish.
* Drop legacy media code
This removes oakkitten's custom media checking code, as keeping it
would require keeping a bunch of the duplicated Kotlin logic. His comment
about cancellation is incorrect: the call can be cancelled with backend.
setWantsAbort() on a background thread. And since the app enforces filenames
are normalized when they're added anyway, I don't think avoiding automatic
normalization is worth the duplicated code.
* Drop legacy Collection/DB code
* Drop most references to defaultLegacySchema
* Remove legacy schema tests from CI
CI won't work yet, because backend version needs updating
* Fix import CSV call
* Remove some unused symbols from anki module
* Drop majority of old stats code
* Remove unused symbols from libanki
* Remove some broken Android tests, and fix one
checkIfStudyOptionsIsDisplayedOnTablet() is also consistently failing,
but was doing so before I started on these changes.
* Move config methods into col.config
* Simplify config API
- Use kotlinx.serialization so that arbitrary typed objects can be
(de)serialized
- There is a single generic get(), that always returns an optional
value, which will be null if the key is missing, is null, or is not the
correct type. There will always be collections that have invalid data,
so the calling code always needs to be prepared to substitute a reasonable
default in such cases.
- Expose the typed getBool() method from the backend.
* Remove unused legacy importer
* Drop jackson
* Models -> Notetypes
* Remove some more unused symbols
* Remove generic type aliases
* Rename Model -> Notetype
I had to leave ModelTest.kt's filename alone, as changing it to Notetype.kt
reorders the unit tests, and causes about 4 tests to start flaking.
* Get card template editor preview working again
* Enable undo on edits; fix test hang
* Use backend for bulk suspend/undo
By default, undoableOp() notifies all screens listening for opExecuted,
so the refreshing happens automatically, and the manual refresh code
at the end of the old routine is no longer required. It is possible to
bypass this when you want to manually update the UI, but this is probably
not worth attempting until the card browser is either switched over to
a recycler view, or reimplemented as a web component.
The LongArrays have been switched to simple lists, as Google's protobuf
code expects Iterable<Long>
* Use backend for marking/undo, and change deck/undo
* Migrate reviewer actions/undo to backend
* Migrate remainder of undo code to backend, apart from v2 undo
Couple of notes:
- The legacy v2 undo no longer returns the undone card, and instead
rebuilds the queue. In some circumstances (eg a learning card has become
due), this can result in a different card being shown after undoing.
This is not ideal, but v2 does not have long to live at this point.
- The reset/reposition tests were reusing the old card cache values,
which have to be reloaded after an operation.
- A test in AbstractSched had to be moved to ReviewerTest so it can have
access to an activity.
- UndoTest has been removed, as it mainly focused on removed code.
* GetCard() -> getNextCardAndRedraw()
* render_output -> renderOutput()
* Drop AsyncTask
Probably the hardest part of AnkiDroid's code base to follow; very
glad to see the end of it.
Closes#7108
* Make note addition undoable
* Make bulk tag update undoable
* Remove remaining explicit transaction handling
The backend automatically wraps backend actions in a transaction,
and removing the explicit calls will allow us to drop the redundant
mutex that rsdroid acquires.
* Remove remaining unused classes/methods/properties
* Remove FunctionalInterfaces
* Switch to backend answer comparison
* Remove unused locking code + legacy storage code
* Switch ContentProviderTest to new schema, and fix bug
* Remove legacy Deck Options settings
* fix: remove minSdkVersion < 23 code
* Use short time in snackbars
People complained about snackbars interrupting their reviews before
* fix: don't duplicate undo label
It were showing a message like `Undo Undo Add Note`
* Remove "Advanced statistics"
* Remove legacy_schema local property
* Leave zip validation up to the backend
The backend takes care of validating the zip file and ensuring files aren't
written outside of the media folder.
I've expanded the mime match to include the zip mime, on the assumption
that's what the mime type is being changed to on some devices. If that
proves to be insufficient, a much simpler approach would be to look
for 50 4B 03 04 at the start of the file to determine if it's a zip file
or not.
This leaves only Mani's add-on code using commons-compression, so you
could potentially switch to a simpler tgz-specific library in the future
if that is easier.
* Disable two flaky tests
They started to flaky reliably after the legacy deck options test
was removed.
* Improve logging of HTTP requests
* Remove ModelBrowser
Replaced by ManageNotetypes
* Remove legacy CardInfo
replaced by com.ichi2.anki.pages.CardInfo
* Change comments at AdvancedSettingsFragment
* test: check if prefs analytics list don't have extra elements
* ContextCompat.getColor -> getColor
that compat method is for implementations in API < 23
* Remove more unused files
* refactor: move SECONDS_PER_DAY to a separate util file
in order to be able to remove Stats.kt later
* refactor: remove Stats and OverviewStatsBuilder
* Access sched.card directly in tests
The helper was adding a 500ms sleep on every fetch, which slowed the
scheduler tests down considerably.
* Make v3 scheduler the default; drop support for v2
The v3 scheduler was originally released in 2021, and we've been waiting
for a stable AnkiDroid release to support it before we could switch users
over to it. Now that 2.16 is out, we can finally push v3 out across the
ecosystem.
While we could theoretically make v3 the default without removing v2,
here are the reasons why I think we're better off switching to v3 only:
- AnkiWeb's review interface will likely switch over to v3-only in the
coming weeks, and AnkiMobile will likely drop v2 around the same time
2.17 comes out.
- v2 and v3 differ in a few ways that makes maintaining the two separate
paths more complicated: things like the different undo paths, counts not
including the current card, and the way the v3 scheduler supports custom
scheduler js. 2.17 is a chance to clean up a lot of old cruft in the
code base, and the old scheduling code is part of that.
- v2 and v3 are compatible with each other, and don't require a full sync
to change, so it doesn't break syncing with old clients (though depending
on settings, due counts may differ, which needs explanation)
I had to disable a couple of tests for this that we'll probably want
to restore in some form:
- corruptVersion16CollectionShowsDatabaseError() needs an update, and
it may be time to rip out the old CollectionHelper colIsOpen(), getColSafe()
and so on, migrating code that uses it over to withCol() instead. The
'collection inaccessible' dialog also needs a rethink - perhaps the various
exceptions could be handled in launchCatchingTask instead.
- testUndoResetsCardCountsToCorrectValue() is failing because initLayout()
creates a gesture listener, which fails with an error about the looper
not being initialized. I am not sure what's going on there - one option
would be to move the test to androidTest.
* Drop v2 sched file; rename files
* Drop AbstractSched and legacy undo code/queue code
* Migrate BaseSched into Scheduler
* More unused symbol removal
* Remove DeckTreeNode
* Remove unused processChildren()
* Remove shouldDisplayCounts(), as counts always available
* Remove manual hashCode()/compareTo() implementations
* Drop AbstractDeckTreeNode
* Turn DeckNode into a wrapper for DeckTreeNode
* Drop TreeNode and simplify filtering
* Remove `New card position` global preference
Overridden by per-deck configuration
Closes#12319
* fix: remove chess.css from card_template_html
* Store current queue state in reviewer
Prerequisite for solving #12620
Also dropped answerButtons(), as it's always 4
* Use local HTTP server for serving flashcard content
Prerequisite for solving #12620
* Implement support for custom JS scheduling
Enables FSRS and closes#12620
* Remove more unused code
* Remove separate Deck(Config)V16 objects and more unused code
* Move some NotetypeJson methods into its file
* Finish tidying Decks.kt
* Drop redundant col property on Collection
* Remove some usages of CollectionGetter
* Rename col->getColUnsafe to encourage migration
* Remove Reviewer.sched
* Handle deck tree not initialized in empty collection
* refactor: move syncStatus() to Collection
to avoid direct calls to the backend
* fix: do not show error when updating the menu if there is no internet
Reproduction steps:
1. have the collection synced
2. disable the device internet connection
3. Restart the app
* Remove unused resources and re-enable lint
* Restore sync cancel strings
* Defer loading webpage until server has initialized
* Ignore translations without a base entry
https://github.com/ankidroid/Anki-Android/pull/14171#issuecomment-1660286342
* Remove the SortOrder deprecation
* Remove the apparently-unused Backup.kt
* Remove last remaining use of Collection's context field
* Stop passing Context to backend
The library loading is now AnkiDroid's responsibility, so the backend
does not require access to an Android context.
Also remove the unused context field from Collection.
* Use backend for rendering next time labels
* Use backend for rendering finished message
The custom study & unbury descriptions are slightly different, but
should suffice until AnkiDroid can start using the Svelte finished
screen.
* Run SchedulerTest without Robolectric
Halves the run time. To do this, I implemented a new JvmTest class
and copied some of the helpers in RobolectricTest into it.
* Remove unused Kotlin implementation of template parsing
* Move Util code dealing with resources out of libanki
* Migrate remaining libanki tests to raw JVM
+ Remove some commented-out tests
Total savings are a drop from about 3m40s to 2m40s, with the scheduler
test class dropping its runtime by about half.
* Lazy-initialize col in tests
* Restore 'experimental' string
* Add comments to update-localizations.py
* Restore AcraAnalyticsInteraction.kt
---------
Co-authored-by: Brayan Oliveira <69634269+brayandso@users.noreply.github.com>
If detected, shows an IDE lint.
- Catches calls to col.* inside AnkiActivity contexts.
- Catches calls to methods of classes derived from AnkiActivity, eg
```
withCol {
someDeckPickerMethod()
}
```
- UI classes that don't inherit from AnkiActivity are not caught unless
they are also annotated with @UiThread. Eg SetNotetypeListener in
NoteEditor references col, but is not caught without an extra annotation.
It might be best to wait until 2.16 is out (and any quick follow-up
releases to address the inevitable regressions) before we start addressing
these issues in bulk; for now the code might be better left as-is unless
it's to address a known bug someone has reported.
Related: #13944, #13942, #13936
Adds in lint check and fixes error message. The lint check enforces
`super.method` if a method is annotated with `@CallSuper`
Previous Error was:
```
java.lang.UnsatisfiedLinkError: 'long net.ankiweb.rsdroid.NativeMethods.openBackend(byte[])'
at net.ankiweb.rsdroid.NativeMethods.openBackend(Native Method)
...
```
The `Error` is only thrown in the case that Robolectric is used
https://developer.android.com/reference/androidx/annotation/CallSuper
- bcprov gradle.properties setting no longer needed, fix released in AGP7.1
- androidx.core resolution strategy no longer needed (actually was in fragment 1.4)
- opt in to api component publishing new regime to quiet warning
- disable certain lints that were not providing value or are already tracked
The API project used the same lint checks as AnkiDroid,
this failed, as "BinaryOperationInTimber" was defined but
Timber wasn't included in the project.
Related: AGP 7 upgrade: 9338
