Skip to content

Update 2.1 branch from flerda#2

Merged
flerda merged 31 commits intoankidroid:v2.1-devfrom
flerda:v2.1-dev
Jan 23, 2013
Merged

Update 2.1 branch from flerda#2
flerda merged 31 commits intoankidroid:v2.1-devfrom
flerda:v2.1-dev

Conversation

@flerda
Copy link
Copy Markdown
Member

@flerda flerda commented Jan 23, 2013

No description provided.

nicolas-raoul and others added 30 commits January 15, 2013 02:28
…eck (dae/anki c335ea2) - No real change, as we don't use aqt/models:_tmpNote() that uses this change - still I optimized a bit the Models.current() calls and added some javadoc
If the card count is not fetched correctly, we should fail the import.
Issue 1567: Handle failure to fetch card count.
Issue 1624: JSON problem with null values
…lready upgraded?' comes up and we reply 'do nothing'
Issue 1626: Alternative cloze format causes crash.
Issue 1621: Change error messages for wrong time.
Issue 1619: Change "dynamic" to "filtered" deck.
Removing some extra whitespace.
Catch up merge from iniju into 2.0.1
function doesn't escape forward slashes when serializing. Android's
org.json.JSONObject.toString() function does escape them. That means
that when we save some card templates (frequently having tags that have
a forward slash when closing) we might be breaking them.
Catch up merge from 2.0.1 into 2.1
@ghost ghost assigned flerda Jan 23, 2013
flerda added a commit that referenced this pull request Jan 23, 2013
Update 2.1 branch from flerda
@flerda flerda merged commit 5b481ee into ankidroid:v2.1-dev Jan 23, 2013
@david-allison david-allison mentioned this pull request Aug 3, 2020
@zaz zaz mentioned this pull request May 23, 2022
Scapesfear added a commit to Scapesfear/Anki-Android that referenced this pull request Jan 11, 2025
# This is the 1st commit message:

Fix missing auto-scroll feature in RecyclerView when switching to multiselectview

# This is the commit message ankidroid#2:

# This is the commit message ankidroid#3:

# This is the commit message ankidroid#4:
@ghost ghost mentioned this pull request Nov 11, 2025
Closed
github-merge-queue bot pushed a commit that referenced this pull request Dec 20, 2025
� This is the 1st commit message:

added test files for currentdeckid()

 mark test as flaky

Issue 19729

fix(deckpicker): Added contentDescription to sync and add card buttons

deprecation(libanki): prefer `defaultsForAdding()` over `current()`

Deprecates Notetypes.current() in favor of col.defaultsForAdding()

Fixes: 19650
Co-authored-by: David Allison <62114487+david-allison@users.noreply.github.com>

chore: log 'Activity with no Application' error

It's likely that there's another cause other than the backup manager

Diagnostics for issue 19050

style: fix dangling top-level KDocs

This breaks KtLint 1.8.0

> A dangling toplevel KDoc is not allowed (cannot be auto-corrected)

* modify `libs.versions.toml` to use `ktlint = '1.8.0'`
* ./gradlew ktLintFormat
* revert all changes
* manually fix warnings, searching for 'dangling'
* manually check fixes ensuring only top-level comments
 are processed

Issue 19614 - updating ktLint

docs(github): Explain workflows

Quality Checks can be linked to from other pages as an onboarding guide

https://github.com/ankidroid/Anki-Android/tree/main/.github/workflows/README.md#quality-checks

docs(deps): improve AndroidX lifecycle-process

* link changelogs
* rename to 'androidxLifecycleProcess'
* make location consistent with other libraries

Added in 7f7cd37

Disable "Scroll toolbar" if toolbar is not shown

In the note editor's overflow menu,
disable the "Scroll toolbar" option
if the toolbar (for HTML formatting) is not shown.

Add comprehensive tests for Card.currentDeckId()

- Test normal deck scenario (oDid=0 returns did)
- Test filtered deck scenario (oDid takes priority)
- Test precedence when both IDs are positive
- Test real-world filtered deck usage
- Test normal deck default behavior
- Test edge case where both IDs are same

Addresses @NeedsTest annotation on currentDeckId() method

Update Card.kt

Update CardTest.kt

chore: fix warnings in ExifUtil and UniqueArrayList

* Convert var to val in ExifUtil
* Fix KDoc references in UniqueArrayList

Issue: 13282
Co-authored-by: David Allison <62114487+david-allison@users.noreply.github.com>

Add comprehensive tests for Card.currentDeckId()

- Test normal deck scenario (oDid=0 returns did)
- Test filtered deck scenario (oDid takes priority)
- Test precedence when both IDs are positive
- Test real-world filtered deck usage
- Test normal deck default behavior
- Test edge case where both IDs are same

Addresses @NeedsTest annotation on currentDeckId() method

Update Card.kt

Update CardTest.kt

Update Card.kt

Update Card.kt

Update CardTest.kt

Update CardTest.kt

Update CardTest.kt

Update Card.kt

Update CardTest.kt

Update CardTest.kt

Update CardTest.kt

Update tests to verify functionality calling currentDeckId()

Update CardTest.kt

Update CardTest.kt

Update CardTest.kt

Update CardTest.kt

Update CardTest.kt

Revert "added test files for currentdeckid()"

This reverts commit 1b3060e.

� This is the commit message #2:

Update Card.kt
� This is the commit message #3:

Update CardTest.kt
� This is the commit message #4:

Update Card.kt
� This is the commit message #5:

Update CardTest.kt
� This is the commit message #6:

Revert "Update Card.kt & Cardtest.kt"

This reverts commit 5bc3121.

Test files in cardtest.kt & card.kt
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.

3 participants