Fix handling of multiple buttons with different visibility in the sam…

…e spot (#3784) Signed-off-by: Jimmy Tanagra <[email protected]>
openhab · Jul 30, 2024 · 69ffbcb · 69ffbcb
1 parent fd8692b
commit 69ffbcb
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/mobile/src/main/java/org/openhab/habdroid/ui/WidgetAdapter.kt b/mobile/src/main/java/org/openhab/habdroid/ui/WidgetAdapter.kt
@@ -912,7 +912,9 @@ class WidgetAdapter(
                     }
 
                     // Rows and columns start with 1 in Sitemap definition, thus decrement them here
-                    val button = buttons.firstOrNull { (it.row ?: 0) - 1 == row && (it.column ?: 0) - 1 == column }
+                    val button = buttons
+                        .filter { it.visibility == true }
+                        .firstOrNull { (it.row ?: 0) - 1 == row && (it.column ?: 0) - 1 == column }
                     if (button != null && button.visibility) {
                         buttonView.tag = button
                         buttonView.setOnClickListener(this)