Ask which deck options to open in reviewer

AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt

@@ -315,7 +315,6 @@ class ReviewerFragment :
     }
 
     override fun onMenuItemClick(item: MenuItem): Boolean {
-        Timber.v("ReviewerFragment::onMenuItemClick %s", item)
         if (item.hasSubMenu()) return false
         val action = ViewerAction.fromId(item.itemId)
         viewModel.executeAction(action)
@@ -586,6 +585,27 @@ class ReviewerFragment :
                     }
                 }
             }
+        viewModel.chooseDeckOptionsFlow
+            .flowWithLifecycle(lifecycle)
+            .collectIn(lifecycleScope) { (currentDeckId, cardDeckId) ->
+                AlertDialog
+                    .Builder(requireContext())
+                    .setTitle(R.string.choose_deck_options_title)
+                    .setItems(
+                        arrayOf(
+                            currentDeckId.toString(),
+                            cardDeckId.toString(),
+                        ),
+                    ) { _, which ->
+                        val targetDeckId =
+                            if (which == 0) currentDeckId else cardDeckId
+
+                        lifecycleScope.launch {
+                            viewModel.openDeckOptionsForDeck(targetDeckId)
+                        }
+                    }.setNegativeButton(android.R.string.cancel, null)
+                    .show()
+            }
     }
 
     override fun onSelectedTags(

AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt

@@ -286,12 +286,23 @@ class ReviewerViewModel(
         destinationFlow.emit(destination)
     }
 
+    val chooseDeckOptionsFlow = MutableSharedFlow<Pair<Long, Long>>()
+
     private suspend fun emitDeckOptionsDestination() {
-        val deckId = withCol { decks.getCurrentId() }
+        val currentDeckId = withCol { decks.getCurrentId() }
+        val cardDeckId = currentCard.await().currentDeckId()
+
+        if (currentDeckId == cardDeckId) {
+            val isFiltered = withCol { decks.isFiltered(currentDeckId) }
+            destinationFlow.emit(DeckOptionsDestination(currentDeckId, isFiltered))
+        } else {
+            chooseDeckOptionsFlow.emit(currentDeckId to cardDeckId)
+        }
+    }
+
+    suspend fun openDeckOptionsForDeck(deckId: Long) {
         val isFiltered = withCol { decks.isFiltered(deckId) }
-        val destination = DeckOptionsDestination(deckId, isFiltered)
-        Timber.i("Launching 'deck options' for deck %d", deckId)
-        destinationFlow.emit(destination)
+        destinationFlow.emit(DeckOptionsDestination(deckId, isFiltered))
     }
 
     private suspend fun emitBrowseDestination() {

AnkiDroid/src/main/res/values/02-strings.xml

@@ -19,6 +19,7 @@
 ~ this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <resources>
+    <string name="choose_deck_options_title">Which deck would you like to display options for?</string>
     <!-- Navigation drawer strings -->
     <string name="drawer_open">Open drawer</string>
     <string name="drawer_close">Close drawer</string>