Skip to content

Catch up merge from flerda into 2.0.1#3

Merged
flerda merged 18 commits intoankidroid:v2.0.1-devfrom
flerda:v2.0.1-dev
Jan 30, 2013
Merged

Catch up merge from flerda into 2.0.1#3
flerda merged 18 commits intoankidroid:v2.0.1-devfrom
flerda:v2.0.1-dev

Conversation

@flerda
Copy link
Copy Markdown
Member

@flerda flerda commented Jan 30, 2013

No description provided.

iniju and others added 18 commits January 24, 2013 11:20
Issue 1603: NullPointerException on setTitle call
…hen all are corrupted, improved messages on errors
Prevent dialog dismissal when clicking outside dialog.
when a collection exists already, fix a crash bug in backup manager, fix
crash when cancelling web upgrade too early.
@ghost ghost assigned flerda Jan 30, 2013
@flerda
Copy link
Copy Markdown
Member Author

flerda commented Jan 30, 2013

This is just updating the organization account with my latest.
I will just go ahead and pull it myself.

flerda added a commit that referenced this pull request Jan 30, 2013
Catch up merge from flerda into 2.0.1
@flerda flerda merged commit 81b6ee4 into ankidroid:v2.0.1-dev Jan 30, 2013
timrae pushed a commit that referenced this pull request Jul 24, 2014
@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
aladdin-afk referenced this pull request in aladdin-afk/Anki-Android Dec 14, 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 ankidroid#5:

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

Revert "Update Card.kt & Cardtest.kt"

This reverts commit 5bc3121.

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

2 participants