From c71c2fe04dabaff09346202ce8aaeadd745785f4 Mon Sep 17 00:00:00 2001
From: Arthur Milchior <Arthur@Milchior.fr>
Date: Wed, 16 Oct 2019 09:01:01 +0200
Subject: [PATCH] Correct edition of card in filtered deck

I believe that this pull request corrects issue #3200, issue #3409 and
issue #5184(this is the best report, it gives a LOT of details) which
seems to be thrice the same trouble.

The note editor contains a list of deck. This allows to select in
which deck to put the cards of the new notes. It also allows to move
the current card if it already exists (i.e. if we edit a card while
reviewing it). The default value finally allows to knows the deck of
the card (assuming the card exists).

The trouble being that the deck of the card is not necessarily in the
list of decks. In this card, the editor believes that we want to
change the deck of the card; which is not the case.

Thus this pull request simply add the deck of the current card to the
list of deck. Note that instead the current deck is not anymore added
to the list. However, it creates no trouble because:
* either the current deck is the deck of the card, in which case it is
  in the added to the list since it's the deck of the card.
* it is a parent of the deck of the card, hence it's not filtered,
  hence it's already in the list.

So actually this pull request only ensure that one more deck is added
in the case where the card reviewed is in a filtered deck, which is a
children of the selected deck. In any other case it does not change
anything.

I must state that I believe that ankidroid should not behaves as it
behaves now. Indeed, the fact that there is a single filtered deck in
the list means that choosing this deck has a meaning different from
the meaning of choosing any other deck. However, the GUI does not
emphasize the fact that the meaning of the filtered deck is different
from the meaning of the other decks.

However, even if I don't like this behaviour, it is the current
behaviour when you edit a card and the selected deck is filtered. So I
believe that it should remains the behavior when the deck of the card
is filtered, even if it's not the selected deck.

You can test this commit by following the steps of
https://github.com/ankidroid/Anki-Android/issues/5184#issuecomment-451050218
and checking that the problem did disappear. Furthermore, editing any
other card does not create any trouble.
---
 AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.java b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.java
index 157a270d1f51..0bfb96df7303 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.java
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.java
@@ -461,8 +461,7 @@ public void onClick(View v) {
             try {
                 // add current deck and all other non-filtered decks to deck list
                 long thisDid = d.getLong("id");
-                long currentDid = getCol().getDecks().current().getLong("id");
-                if (d.getInt("dyn") == 0 || (!mAddNote && thisDid == currentDid)) {
+                if (d.getInt("dyn") == 0 || (!mAddNote && mCurrentEditedCard != null && mCurrentEditedCard.getDid() == thisDid)) {
                     deckNames.add(d.getString("name"));
                     mAllDeckIds.add(thisDid);
                 }