From cfb8d371b0f1c33251d285c7a9540899c5804264 Mon Sep 17 00:00:00 2001 From: kari-ts <135075563+kari-ts@users.noreply.github.com> Date: Mon, 12 Jan 2026 12:51:52 -0800 Subject: [PATCH] android: clean up unused method (#731) https://github.com/tailscale/tailscale-android/pull/728 replaced getInterfacesAsString with getInterfacesAsJson. This cleans up that unused method. Updates tailscale/tailscale#16836 Signed-off-by: kari-ts --- .../src/main/java/com/tailscale/ipn/App.kt | 32 ------------------- libtailscale/interfaces.go | 4 --- 2 files changed, 36 deletions(-) diff --git a/android/src/main/java/com/tailscale/ipn/App.kt b/android/src/main/java/com/tailscale/ipn/App.kt index 97b7fe4..2323b0e 100644 --- a/android/src/main/java/com/tailscale/ipn/App.kt +++ b/android/src/main/java/com/tailscale/ipn/App.kt @@ -304,38 +304,6 @@ class App : UninitializedApp(), libtailscale.AppContext, ViewModelStoreOwner { return packageManager.hasSystemFeature("android.hardware.type.pc") } - override fun getInterfacesAsString(): String { - val interfaces: ArrayList = - java.util.Collections.list(NetworkInterface.getNetworkInterfaces()) - val sb = StringBuilder() - for (nif in interfaces) { - try { - sb.append( - String.format( - Locale.ROOT, - "%s %d %d %b %b %b %b %b |", - nif.name, - nif.index, - nif.mtu, - nif.isUp, - nif.supportsMulticast(), - nif.isLoopback, - nif.isPointToPoint, - nif.supportsMulticast())) - for (ia in nif.interfaceAddresses) { - val parts = ia.toString().split("/", limit = 0) - if (parts.size > 1) { - sb.append(String.format(Locale.ROOT, "%s/%d ", parts[1], ia.networkPrefixLength)) - } - } - } catch (e: Exception) { - continue - } - sb.append("\n") - } - return sb.toString() - } - @Serializable data class AddrJson( val ip: String, diff --git a/libtailscale/interfaces.go b/libtailscale/interfaces.go index 73d02f4..ecebba5 100644 --- a/libtailscale/interfaces.go +++ b/libtailscale/interfaces.go @@ -48,10 +48,6 @@ type AppContext interface { // IsChromeOS reports whether we're on a ChromeOS device. IsChromeOS() (bool, error) - // GetInterfacesAsString gets a string representation of all network - // interfaces. - GetInterfacesAsString() (string, error) - // GetInterfacesAsJson gets a JSON representation of all network // interfaces. GetInterfacesAsJson() (string, error)