Fix controls: warn only on true binding conflict

Author: manocormen

AnkiDroid/src/main/java/com/ichi2/preferences/ControlPreference.kt

@@ -215,7 +215,7 @@ open class ControlPreference :
      *
      * @see getRelatedPreferences
      */
-    protected fun getPreferenceAssignedTo(binding: Binding): ControlPreference? {
+    protected open fun getPreferenceAssignedTo(binding: Binding): ControlPreference? {
         for (pref in getRelatedPreferences()) {
             val bindings = pref.getMappableBindings().map { it.binding }
             if (binding in bindings) {

AnkiDroid/src/main/java/com/ichi2/preferences/ReviewerControlPreference.kt

@@ -19,6 +19,7 @@ import android.content.Context
 import android.util.AttributeSet
 import com.ichi2.anki.R
 import com.ichi2.anki.cardviewer.GestureProcessor
+import com.ichi2.anki.common.annotations.NeedsTest
 import com.ichi2.anki.dialogs.CardSideSelectionDialog
 import com.ichi2.anki.preferences.allPreferences
 import com.ichi2.anki.reviewer.Binding
@@ -78,6 +79,16 @@ open class ReviewerControlPreference : ControlPreference {
                 it::class == ReviewerControlPreference::class
             } as List<ReviewerControlPreference>
 
+    @NeedsTest("Ensure correct preference is returned for side-specific binding")
+    override fun getPreferenceAssignedTo(binding: Binding): ControlPreference? {
+        val cardSide = side ?: return super.getPreferenceAssignedTo(binding)
+        val reviewerBinding = ReviewerBinding(binding, cardSide)
+        // Bindings only conflict when the card sides overlap
+        return getRelatedPreferences().firstOrNull { preference ->
+            reviewerBinding in preference.getMappableBindings()
+        }
+    }
+
     fun interface OnBindingSelectedListener {
         /**
          * Called when a binding is selected, before the side is set. This allows listeners