From bfe35330306bd59396ddfd966db0c481a53cda47 Mon Sep 17 00:00:00 2001
From: Zane Schepke <dev@zaneschepke.com>
Date: Thu, 30 Oct 2025 00:53:56 -0400
Subject: [PATCH] fix: android tv long press behavior

#1008
---
 .../wireguardautotunnel/MainActivity.kt       |  7 +++---
 .../ui/common/button/SurfaceRow.kt            | 23 +++++++++++++++++--
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/MainActivity.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/MainActivity.kt
index 36add5a9..f7215415 100644
--- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/MainActivity.kt
+++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/MainActivity.kt
@@ -88,11 +88,11 @@ import com.zaneschepke.wireguardautotunnel.viewmodel.SplitTunnelViewModel
 import com.zaneschepke.wireguardautotunnel.viewmodel.TunnelViewModel
 import dagger.hilt.android.AndroidEntryPoint
 import de.raphaelebner.roomdatabasebackup.core.RoomBackup
+import java.util.*
+import javax.inject.Inject
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import xyz.teamgravity.pin_lock_compose.PinManager
-import java.util.*
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
@@ -449,7 +449,8 @@ class MainActivity : AppCompatActivity() {
 
     fun performBackup() =
         lifecycleScope.launch {
-            // reset active tuns before backup to prevent trying to start them without permission on restore
+            // reset active tuns before backup to prevent trying to start them without permission on
+            // restore
             tunnelRepository.resetActiveTunnels()
             roomBackup
                 .database(appDatabase)
diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/button/SurfaceRow.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/button/SurfaceRow.kt
index ed9c6a46..af9f6c4d 100644
--- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/button/SurfaceRow.kt
+++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/button/SurfaceRow.kt
@@ -1,5 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.ui.common.button
 
+import android.view.KeyEvent
 import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.background
 import androidx.compose.foundation.combinedClickable
@@ -16,10 +17,14 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusProperties
 import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.input.key.Key
+import androidx.compose.ui.input.key.key
+import androidx.compose.ui.input.key.onKeyEvent
 import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.unit.dp
+import com.zaneschepke.wireguardautotunnel.ui.LocalIsAndroidTV
 import com.zaneschepke.wireguardautotunnel.ui.theme.Disabled
 
 @Composable
@@ -29,13 +34,14 @@ fun SurfaceRow(
     onClick: (() -> Unit)? = null,
     description: @Composable (() -> Unit)? = null,
     expandedContent: @Composable (() -> Unit)? = null,
-    onLongClick: () -> Unit = {},
+    onLongClick: (() -> Unit)? = null,
     enabled: Boolean = true,
     selected: Boolean = false,
     leading: @Composable (() -> Unit)? = null,
     trailing: @Composable ((Modifier) -> Unit)? = null,
 ) {
     val density = LocalDensity.current
+    val isTv = LocalIsAndroidTV.current
     var leadingPadding by remember { mutableStateOf(0.dp) }
     val interactionSource = remember { MutableInteractionSource() }
     val mainFocusRequester = remember { FocusRequester() }
@@ -62,7 +68,20 @@ fun SurfaceRow(
         ) {
             Row(
                 modifier =
-                    Modifier.focusRequester(mainFocusRequester)
+                    Modifier.onKeyEvent { event ->
+                            if (onLongClick == null || isTv) {
+                                if (
+                                    event.key == Key.DirectionCenter &&
+                                        event.nativeKeyEvent.action == KeyEvent.ACTION_DOWN
+                                ) {
+                                    // Consume the down event to prevent the default long press
+                                    // behavior
+                                    return@onKeyEvent true
+                                }
+                            }
+                            false
+                        }
+                        .focusRequester(mainFocusRequester)
                         .focusProperties {
                             if (onClick != null) {
                                 right = trailingFocusRequester