Merge branch 'main' into kari/taildropsaf

Signed-off-by: kari-ts <[email protected]>

Author: kari-ts

.github/workflows/android.yml

@@ -16,12 +16,12 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
-      - uses: actions/setup-go@v5
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
         with:
           go-version-file: "go.mod"
       - name: Switch to Java 17 # Note: 17 is pre-installed on ubuntu-latest
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
         with:
           distribution: "temurin"
           java-version: "17"

.github/workflows/go_mod_tidy.yml

@@ -19,10 +19,10 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
         with:
           cache: false
           go-version-file: go.mod

.github/workflows/license-headers.yml

@@ -14,6 +14,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: check license headers
         run: ./scripts/check_license_headers.sh .

Makefile

@@ -10,7 +10,7 @@
 # with this name, it will be used.
 #
 # The convention here is tailscale-android-build-amd64-<date>
-DOCKER_IMAGE := tailscale-android-build-amd64-031325-1
+DOCKER_IMAGE := tailscale-android-build-amd64-041425-1
 export TS_USE_TOOLCHAIN=1
 
 # Auto-select an NDK from ANDROID_HOME (choose highest version available)
@@ -355,13 +355,12 @@ docker-remove-build-image: ## Removes the current docker build image
 docker-all: docker-build-image docker-run-build $(DOCKER_IMAGE)
 
 .PHONY: docker-shell
-docker-shell: ## Builds a docker image with the android build env and opens a shell
-	docker build -f docker/DockerFile.amd64-shell -t tailscale-android-shell-amd64 .
-	docker run --rm -v $(CURDIR):/build/tailscale-android -it tailscale-android-shell-amd64
+docker-shell: docker-build-image ## Builds a docker image with the android build env and opens a shell
+	docker run --rm -v $(CURDIR):/build/tailscale-android -it $(DOCKER_IMAGE) /bin/bash
 
 .PHONY: docker-remove-shell-image
 docker-remove-shell-image: ## Removes all docker shell image
-	docker rmi --force tailscale-android-shell-amd64
+	@echo "docker-remove-shell-image retained for backward compatibility, but is a no-op; docker-shell now uses build image"
 
 .PHONY: clean
 clean: ## Remove build artifacts. Does not purge docker build envs. Use dockerRemoveEnv for that.

android/build.gradle

@@ -139,7 +139,7 @@ dependencies {
     implementation "androidx.compose.animation:animation:1.7.4"
 
     // Navigation dependencies.
-    def nav_version = "2.8.2"
+    def nav_version = "2.8.5"
     implementation "androidx.navigation:navigation-compose:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
 

android/src/main/java/com/tailscale/ipn/ui/model/Ipn.kt

@@ -31,7 +31,7 @@ class Ipn {
     }
   }
 
-  // A nofitication message recieved on the Notify bus.  Fields will be populated based
+  // A notification message received on the Notify bus.  Fields will be populated based
   // on which NotifyWatchOpts were set when the Notifier was created.
   @Serializable
   data class Notify(

android/src/main/java/com/tailscale/ipn/ui/view/MainView.kt

@@ -3,6 +3,7 @@
 
 package com.tailscale.ipn.ui.view
 
+import android.os.Build
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -45,7 +46,6 @@ import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
@@ -548,13 +548,14 @@ fun PeerList(
   var isListFocussed by remember { mutableStateOf(false) }
   val expandedPeer = viewModel.expandedMenuPeer.collectAsState()
   val localClipboardManager = LocalClipboardManager.current
-  val enableSearch = !isAndroidTV()
+  // Restrict search to devices running API 33+ (see https://github.com/tailscale/corp/issues/27375)
+  val enableSearch = Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
 
   Column(modifier = Modifier.fillMaxSize()) {
-    if (FeatureFlags.isEnabled("enable_new_search")) {
+    if (enableSearch && FeatureFlags.isEnabled("enable_new_search")) {
       Search(onSearchBarClick)
     } else {
-      if (enableSearch) {
+      if (!isAndroidTV()) {
         Box(
             modifier =
                 Modifier.fillMaxWidth().background(color = MaterialTheme.colorScheme.surface)) {

docker/DockerFile.amd64-build

@@ -3,31 +3,30 @@
 
 FROM --platform=linux/amd64 eclipse-temurin:21
 
-# To enable running android tools such as aapt
-RUN apt-get update && apt-get -y upgrade
-RUN apt-get install -y libz1 libstdc++6 unzip zip
-# For Go:
-RUN apt-get -y --no-install-recommends install curl gcc
-RUN apt-get -y --no-install-recommends install ca-certificates libc6-dev git
-
-RUN apt-get -y install make
-
-RUN mkdir -p build
 ENV HOME /build
-
-# Make android sdk location, the later make step will populate it.
-RUN mkdir android-sdk
 ENV ANDROID_HOME $HOME/android-sdk
 ENV ANDROID_SDK_ROOT $ANDROID_HOME
 ENV PATH $PATH:$HOME/bin:$ANDROID_HOME/platform-tools
 
+RUN mkdir -p \
+    ${HOME} \
+    /android-sdk \
+    ${ANDROID_HOME} \
+    $HOME/tailscale-android
+
+# To enable running android tools such as aapt
+COPY scripts/docker-build-apt-get.sh /tmp
+RUN chmod 755 /tmp/docker-build-apt-get.sh && \
+    /tmp/docker-build-apt-get.sh && \
+    rm -f /tmp/docker-build-apt-get.sh
+
 # We need some version of Go new enough to support the "embed" package
 # to run "go run tailscale.com/cmd/printdep" to figure out which Tailscale Go
 # version we need later, but otherwise this toolchain isn't used:
-RUN curl -L https://go.dev/dl/go1.23.0.linux-amd64.tar.gz | tar -C /usr/local -zxv
-RUN ln -s /usr/local/go/bin/go /usr/bin
+RUN \
+    curl -L https://go.dev/dl/go1.24.1.linux-amd64.tar.gz | tar -C /usr/local -zxv && \
+    ln -s /usr/local/go/bin/go /usr/bin
 
-RUN mkdir -p $HOME/tailscale-android
 RUN git config --global --add safe.directory $HOME/tailscale-android
 WORKDIR $HOME/tailscale-android
 
@@ -37,10 +36,11 @@ COPY Makefile Makefile
 RUN make androidsdk
 
 # Preload Gradle
-COPY android/gradlew android/gradlew
+COPY android/gradlew android/build.gradle android
 COPY android/gradle android/gradle
-RUN ./android/gradlew
+
+RUN chmod 755 android/gradlew && \
+    ./android/gradlew
 
 # Build the android app, bump the playstore version code, and make the tv release
 CMD make clean && make release && make bump_version_code && make release-tv
-

docker/DockerFile.amd64-shell

@@ -5,8 +5,7 @@ go 1.24.0
 require (
 	github.com/tailscale/wireguard-go v0.0.0-20250304000100-91a0587fb251
 	golang.org/x/mobile v0.0.0-20240806205939-81131f6468ab
-	inet.af/netaddr v0.0.0-20220617031823-097006376321
-	tailscale.com v1.81.0-pre.0.20250313173742-f0b395d851bb
+	tailscale.com v1.83.0-pre.0.20250414201714-10fd61f1bb6b
 )
 
 require (
@@ -79,18 +78,16 @@ require (
 	github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 // indirect
 	github.com/vishvananda/netns v0.0.4 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect
 	go4.org/mem v0.0.0-20240501181205-ae6ca9944745 // indirect
 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
-	go4.org/unsafe/assume-no-moving-gc v0.0.0-20230525183740-e7c30c78aeb2 // indirect
-	golang.org/x/crypto v0.35.0 // indirect
+	golang.org/x/crypto v0.37.0 // indirect
 	golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac // indirect
 	golang.org/x/mod v0.23.0 // indirect
 	golang.org/x/net v0.36.0 // indirect
-	golang.org/x/sync v0.11.0 // indirect
-	golang.org/x/sys v0.31.0 // indirect
-	golang.org/x/term v0.29.0 // indirect
-	golang.org/x/text v0.22.0 // indirect
+	golang.org/x/sync v0.13.0 // indirect
+	golang.org/x/sys v0.32.0 // indirect
+	golang.org/x/term v0.31.0 // indirect
+	golang.org/x/text v0.24.0 // indirect
 	golang.org/x/time v0.10.0 // indirect
 	golang.org/x/tools v0.30.0 // indirect
 	golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect