From e1e01a7cc937e95decee89c5c851cef395ce07ca Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Tue, 2 Mar 2021 11:47:28 +1000 Subject: [PATCH] port parent limit change from desktop https://github.com/ankitects/anki/commit/5f9792392a953271eee21004e3a49b591999b9a7 --- .../main/java/com/ichi2/libanki/sched/SchedV2.java | 12 +----------- .../java/com/ichi2/libanki/sched/SchedV2Test.java | 8 ++++---- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/sched/SchedV2.java b/AnkiDroid/src/main/java/com/ichi2/libanki/sched/SchedV2.java index f94c0aa345..dfee96c5fe 100644 --- a/AnkiDroid/src/main/java/com/ichi2/libanki/sched/SchedV2.java +++ b/AnkiDroid/src/main/java/com/ichi2/libanki/sched/SchedV2.java @@ -1546,17 +1546,7 @@ public class SchedV2 extends AbstractSched { lim--; } - if (parentLimit != null) { - return Math.min(parentLimit, lim); - } else if (!d.getString("name").contains("::")) { - return lim; - } else { - for (@NonNull Deck parent : mCol.getDecks().parents(did)) { - // pass in dummy parentLimit so we don't do parent lookup again - lim = Math.min(lim, _deckRevLimitSingle(parent, lim, considerCurrentCard)); - } - return lim; - } + return lim; } diff --git a/AnkiDroid/src/test/java/com/ichi2/libanki/sched/SchedV2Test.java b/AnkiDroid/src/test/java/com/ichi2/libanki/sched/SchedV2Test.java index 1b02b0ac42..8a57e65b38 100644 --- a/AnkiDroid/src/test/java/com/ichi2/libanki/sched/SchedV2Test.java +++ b/AnkiDroid/src/test/java/com/ichi2/libanki/sched/SchedV2Test.java @@ -782,21 +782,21 @@ public class SchedV2Test extends RobolectricTest { // (('parent', 1514457677462, 5, 0, 0, (('child', 1514457677463, 5, 0, 0, ()),))) assertEquals("parent", tree.getFullDeckName()); assertEquals(5, tree.getRevCount()); // paren, tree.review_count)t - assertEquals(5, tree.getChildren().get(0).getRevCount()); + assertEquals(10, tree.getChildren().get(0).getRevCount()); // .counts() should match col.getDecks().select(child.getLong("id")); col.reset(); - assertEquals(new Counts(0, 0, 5), col.getSched().counts()); + assertEquals(new Counts(0, 0, 10), col.getSched().counts()); // answering a card in the child should decrement parent count Card c = getCard(); col.getSched().answerCard(c, 3); - assertEquals(new Counts(0, 0, 4), col.getSched().counts()); + assertEquals(new Counts(0, 0, 9), col.getSched().counts()); tree = col.getSched().deckDueTree().get(1); assertEquals(4, tree.getRevCount()); - assertEquals(4, tree.getChildren().get(0).getRevCount()); + assertEquals(9, tree.getChildren().get(0).getRevCount()); }