From e77dcd99336e5ccd41c9588e3fe4063dff593666 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Fri, 19 Jun 2020 20:31:50 +0200 Subject: [PATCH] com/tailscale/ipn: strip manufacturer from model name Some devices prefix Build.MODEL with Build.Manufacturer, some don't. Strip the duplicates. Signed-off-by: Elias Naur --- android/src/main/java/com/tailscale/ipn/App.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/android/src/main/java/com/tailscale/ipn/App.java b/android/src/main/java/com/tailscale/ipn/App.java index 38633e3..c876d7b 100644 --- a/android/src/main/java/com/tailscale/ipn/App.java +++ b/android/src/main/java/com/tailscale/ipn/App.java @@ -83,7 +83,15 @@ public class App extends Application { } String getHostname() { - return Build.MANUFACTURER + " " + Build.MODEL; + String manu = Build.MANUFACTURER; + String model = Build.MODEL; + // Strip manufacturer from model. + int idx = model.toLowerCase().indexOf(manu.toLowerCase()); + if (idx != -1) { + model = model.substring(idx + manu.length()); + model = model.trim(); + } + return manu + " " + model; } // Tracklifecycle adds a Peer fragment for tracking the Activity