From 3d03d04b7b106165f95d38d087d0985271b91b0c Mon Sep 17 00:00:00 2001
From: davfsa <davfsa@gmail.com>
Date: Thu, 13 Mar 2025 01:31:26 +0100
Subject: [PATCH 1/2] android: ensure in secure state to interact with
quicktile
Updates tailscale/tailscale#14628
Signed-off-by: davfsa <davfsa@gmail.com>
---
.../src/main/java/com/tailscale/ipn/QuickToggleService.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/android/src/main/java/com/tailscale/ipn/QuickToggleService.java b/android/src/main/java/com/tailscale/ipn/QuickToggleService.java
index 0ac3bd0ab6..7870688374 100644
--- a/android/src/main/java/com/tailscale/ipn/QuickToggleService.java
+++ b/android/src/main/java/com/tailscale/ipn/QuickToggleService.java
@@ -60,9 +60,13 @@ public void onStopListening() {
}
}
- @SuppressWarnings("deprecation")
@Override
public void onClick() {
+ unlockAndRun(this::secureOnTileClick);
+ }
+
+ @SuppressWarnings("deprecation")
+ private void secureOnTileClick() {
boolean r;
synchronized (lock) {
r = UninitializedApp.get().isAbleToStartVPN();
From 33ce2b7efb8b7f56b60bf279107e22744488253f Mon Sep 17 00:00:00 2001
From: davfsa <davfsa@gmail.com>
Date: Thu, 13 Mar 2025 09:23:56 +0100
Subject: [PATCH 2/2] Update
android/src/main/java/com/tailscale/ipn/QuickToggleService.java
Signed-off-by: davfsa <davfsa@gmail.com>
---
.../src/main/java/com/tailscale/ipn/QuickToggleService.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/android/src/main/java/com/tailscale/ipn/QuickToggleService.java b/android/src/main/java/com/tailscale/ipn/QuickToggleService.java
index 7870688374..f2374ccbf0 100644
--- a/android/src/main/java/com/tailscale/ipn/QuickToggleService.java
+++ b/android/src/main/java/com/tailscale/ipn/QuickToggleService.java
@@ -62,11 +62,11 @@ public void onStopListening() {
@Override
public void onClick() {
- unlockAndRun(this::secureOnTileClick);
+ unlockAndRun(this::secureOnClick);
}
@SuppressWarnings("deprecation")
- private void secureOnTileClick() {
+ private void secureOnClick() {
boolean r;
synchronized (lock) {
r = UninitializedApp.get().isAbleToStartVPN();