version: bump

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

gradle.properties

@@ -1,5 +1,5 @@
-wireguardVersionCode=512
-wireguardVersionName=1.0.20250516
+wireguardVersionCode=518
+wireguardVersionName=1.0.20260102
 wireguardPackageName=com.wireguard.android
 
 # When configured, Gradle will run in incubating parallel mode.

gradle/libs.versions.toml

@@ -1,25 +1,25 @@
 [versions]
-agp = "8.9.3"
-kotlin = "2.1.20"
+agp = "8.13.2"
+kotlin = "2.3.0"
 
 [libraries]
-androidx-activity-ktx = "androidx.activity:activity-ktx:1.10.1"
+androidx-activity-ktx = "androidx.activity:activity-ktx:1.12.2"
 androidx-annotation = "androidx.annotation:annotation:1.9.1"
-androidx-appcompat = "androidx.appcompat:appcompat:1.7.0"
+androidx-appcompat = "androidx.appcompat:appcompat:1.7.1"
 androidx-biometric = "androidx.biometric:biometric:1.1.0"
 androidx-collection = "androidx.collection:collection:1.5.0"
 androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.2.1"
 androidx-coordinatorlayout = "androidx.coordinatorlayout:coordinatorlayout:1.3.0"
-androidx-core-ktx = "androidx.core:core-ktx:1.16.0"
-androidx-datastore-preferences = "androidx.datastore:datastore-preferences:1.1.6"
-androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.8.6"
-androidx-lifecycle-runtime-ktx = "androidx.lifecycle:lifecycle-runtime-ktx:2.9.0"
+androidx-core-ktx = "androidx.core:core-ktx:1.17.0"
+androidx-datastore-preferences = "androidx.datastore:datastore-preferences:1.2.0"
+androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.8.9"
+androidx-lifecycle-runtime-ktx = "androidx.lifecycle:lifecycle-runtime-ktx:2.10.0"
 androidx-preference-ktx = "androidx.preference:preference-ktx:1.2.1"
 desugarJdkLibs = "com.android.tools:desugar_jdk_libs:2.1.5"
-google-material = "com.google.android.material:material:1.12.0"
+google-material = "com.google.android.material:material:1.13.0"
 jsr305 = "com.google.code.findbugs:jsr305:3.0.2"
 junit = "junit:junit:4.13.2"
-kotlinx-coroutines-android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
+kotlinx-coroutines-android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"
 zxing-android-embedded = "com.journeyapps:zxing-android-embedded:4.3.0"
 
 [plugins]

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=61ad310d3c7d3e5da131b76bbf22b5a4c0786e9d892dae8c1658d4b484de3caa
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -115,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -173,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -206,15 +203,14 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

tunnel/build.gradle.kts

@@ -1,6 +1,7 @@
 @file:Suppress("UnstableApiUsage")
 
 import org.gradle.api.tasks.testing.logging.TestLogEvent
+import org.gradle.api.tasks.bundling.Zip
 
 val pkg: String = providers.gradleProperty("wireguardPackageName").get()
 
@@ -18,7 +19,7 @@ android {
     }
     namespace = "${pkg}.tunnel"
     defaultConfig {
-        minSdk = 21
+        minSdk = 24
     }
     externalNativeBuild {
         cmake {
@@ -34,6 +35,7 @@ android {
                 cmake {
                     targets("libwg-go.so", "libwg.so", "libwg-quick.so")
                     arguments("-DGRADLE_USER_HOME=${project.gradle.gradleUserHomeDir}")
+                    arguments("-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON")
                 }
             }
         }
@@ -112,16 +114,29 @@ publishing {
     }
     repositories {
         maven {
-            name = "sonatype"
-            url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
-            credentials {
-                username = providers.environmentVariable("SONATYPE_USER").orNull
-                password = providers.environmentVariable("SONATYPE_PASSWORD").orNull
-            }
+            name = "SonatypeUpload"
+            setUrl(layout.buildDirectory.dir("sonatype"))
         }
     }
 }
 
+val releasePublication = publishing.publications.named("release").get() as MavenPublication
+val mavenGroupPath = releasePublication.groupId.replace('.', '/')
+val mavenArtifactId = releasePublication.artifactId
+val mavenVersion = releasePublication.version
+
+tasks.register<Zip>("zipReleasePublication") {
+    dependsOn(tasks.named("publishReleasePublicationToSonatypeUploadRepository"))
+    group = "distribution"
+    description = "Zips the release publication in Maven repository layout."
+
+    val sourceDir = layout.buildDirectory.dir("sonatype/${mavenGroupPath}/${mavenArtifactId}/${mavenVersion}")
+    from(sourceDir)
+    archiveFileName.set("${mavenArtifactId}-${mavenVersion}-maven.zip")
+    destinationDirectory.set(layout.buildDirectory.dir("distributions"))
+    into("${mavenGroupPath}/${mavenArtifactId}/${mavenVersion}")
+}
+
 signing {
     useGpgCmd()
     sign(publishing.publications)

tunnel/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+  ~ Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
   ~ SPDX-License-Identifier: Apache-2.0
   -->
 

tunnel/src/main/java/com/wireguard/android/backend/Backend.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -52,6 +52,28 @@ public interface Backend {
      */
     String getVersion() throws Exception;
 
+    /**
+     * Determines whether the service is running in always-on VPN mode.
+     * In this mode the system ensures that the service is always running by restarting it when necessary,
+     * e.g. after reboot.
+     *
+     * @return A boolean indicating whether the service is running in always-on VPN mode.
+     * @throws Exception Exception raised while retrieving the always-on status.
+     */
+
+    boolean isAlwaysOn() throws Exception;
+
+    /**
+     * Determines whether the service is running in always-on VPN lockdown mode.
+     * In this mode the system ensures that the service is always running and that the apps
+     * aren't allowed to bypass the VPN.
+     *
+     * @return A boolean indicating whether the service is running in always-on VPN lockdown mode.
+     * @throws Exception Exception raised while retrieving the lockdown status.
+     */
+
+    boolean isLockdownEnabled() throws Exception;
+
     /**
      * Set the state of a tunnel, updating it's configuration. If the tunnel is already up, config
      * may update the running configuration; config may be null when setting the tunnel down.

tunnel/src/main/java/com/wireguard/android/backend/BackendException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -24,12 +24,10 @@ import com.wireguard.crypto.KeyFormatException;
 import com.wireguard.util.NonNullForAll;
 
 import java.net.InetAddress;
-import java.time.Instant;
 import java.util.Collections;
 import java.util.Set;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
@@ -45,7 +43,7 @@ public final class GoBackend implements Backend {
     private static final int DNS_RESOLUTION_RETRIES = 10;
     private static final String TAG = "WireGuard/GoBackend";
     @Nullable private static AlwaysOnCallback alwaysOnCallback;
-    private static GhettoCompletableFuture<VpnService> vpnService = new GhettoCompletableFuture<>();
+    private static CompletableFuture<VpnService> vpnService = new CompletableFuture<>();
     private final Context context;
     @Nullable private Config currentConfig;
     @Nullable private Tunnel currentTunnel;
@@ -188,6 +186,24 @@ public final class GoBackend implements Backend {
         return wgVersion();
     }
 
+    /**
+     * Determines if the service is running in always-on VPN mode.
+     * @return {@link boolean} whether the service is running in always-on VPN mode.
+     */
+    @Override
+    public boolean isAlwaysOn() throws ExecutionException, InterruptedException, TimeoutException {
+        return vpnService.get(0, TimeUnit.NANOSECONDS).isAlwaysOn();
+    }
+
+    /**
+     * Determines if the service is running in always-on VPN lockdown mode.
+     * @return {@link boolean} whether the service is running in always-on VPN lockdown mode.
+     */
+    @Override
+    public boolean isLockdownEnabled() throws ExecutionException, InterruptedException, TimeoutException {
+        return vpnService.get(0, TimeUnit.NANOSECONDS).isLockdownEnabled();
+    }
+
     /**
      * Change the state of a given {@link Tunnel}, optionally applying a given {@link Config}.
      *
@@ -359,35 +375,6 @@ public final class GoBackend implements Backend {
         void alwaysOnTriggered();
     }
 
-    // TODO: When we finally drop API 21 and move to API 24, delete this and replace with the ordinary CompletableFuture.
-    private static final class GhettoCompletableFuture<V> {
-        private final LinkedBlockingQueue<V> completion = new LinkedBlockingQueue<>(1);
-        private final FutureTask<V> result = new FutureTask<>(completion::peek);
-
-        public boolean complete(final V value) {
-            final boolean offered = completion.offer(value);
-            if (offered)
-                result.run();
-            return offered;
-        }
-
-        public V get() throws ExecutionException, InterruptedException {
-            return result.get();
-        }
-
-        public V get(final long timeout, final TimeUnit unit) throws ExecutionException, InterruptedException, TimeoutException {
-            return result.get(timeout, unit);
-        }
-
-        public boolean isDone() {
-            return !completion.isEmpty();
-        }
-
-        public GhettoCompletableFuture<V> newIncompleteFuture() {
-            return new GhettoCompletableFuture<>();
-        }
-    }
-
     /**
      * {@link android.net.VpnService} implementation for {@link GoBackend}
      */
@@ -417,7 +404,10 @@ public final class GoBackend implements Backend {
                     tunnel.onStateChange(State.DOWN);
                 }
             }
-            vpnService = vpnService.newIncompleteFuture();
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
+                vpnService = vpnService.newIncompleteFuture();
+            else
+                vpnService = new CompletableFuture<>();
             super.onDestroy();
         }
 

tunnel/src/main/java/com/wireguard/android/backend/Statistics.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

tunnel/src/main/java/com/wireguard/android/backend/Tunnel.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -109,6 +109,16 @@ public final class WgQuickBackend implements Backend {
         return output.get(0);
     }
 
+    @Override
+    public boolean isAlwaysOn() {
+        return false;
+    }
+
+    @Override
+    public boolean isLockdownEnabled() {
+        return false;
+    }
+
     public void setMultipleTunnels(final boolean on) {
         multipleTunnels = on;
     }

tunnel/src/main/java/com/wireguard/android/util/RootShell.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

tunnel/src/main/java/com/wireguard/android/util/SharedLibraryLoader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

tunnel/src/main/java/com/wireguard/android/util/ToolsInstaller.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

tunnel/src/main/java/com/wireguard/config/Attribute.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

tunnel/src/main/java/com/wireguard/config/BadConfigException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

tunnel/src/main/java/com/wireguard/config/Config.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

tunnel/src/main/java/com/wireguard/config/InetAddresses.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

tunnel/src/main/java/com/wireguard/config/InetEndpoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

tunnel/src/main/java/com/wireguard/config/InetNetwork.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

tunnel/src/main/java/com/wireguard/config/Interface.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

tunnel/src/main/java/com/wireguard/config/ParseException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

tunnel/src/main/java/com/wireguard/config/Peer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

tunnel/src/main/java/com/wireguard/crypto/Curve25519.java

@@ -1,6 +1,6 @@
 /*
  * Copyright © 2016 Southern Storm Software, Pty Ltd.
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

tunnel/src/main/java/com/wireguard/crypto/Key.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

tunnel/src/main/java/com/wireguard/crypto/KeyFormatException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

tunnel/src/main/java/com/wireguard/crypto/KeyPair.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

tunnel/src/main/java/com/wireguard/util/NonNullForAll.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

tunnel/src/test/java/com/wireguard/config/BadConfigExceptionTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

tunnel/src/test/java/com/wireguard/config/ConfigTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

tunnel/tools/CMakeLists.txt

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
-# Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+# Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
 
 cmake_minimum_required(VERSION 3.4.1)
 project("WireGuard")

tunnel/tools/libwg-go/Makefile

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
-# Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+# Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
 
 BUILDDIR ?= $(CURDIR)/build
 DESTDIR ?= $(CURDIR)/out

tunnel/tools/libwg-go/go.mod

@@ -4,7 +4,7 @@ go 1.23.1
 
 require (
 	golang.org/x/sys v0.33.0
-	golang.zx2c4.com/wireguard v0.0.0-20250515145403-1571e0fbae8e
+	golang.zx2c4.com/wireguard v0.0.0-20250521234502-f333402bd9cb
 )
 
 require (

tunnel/tools/libwg-go/go.sum

@@ -10,9 +10,7 @@ golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ=
 golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg=
 golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI=
-golang.zx2c4.com/wireguard v0.0.0-20250515144814-842888ac5c93 h1:7ZEIuxqu71NkNE9klltGsEqv3tiXkUHlZ6aapRGhwwg=
-golang.zx2c4.com/wireguard v0.0.0-20250515144814-842888ac5c93/go.mod h1:rpwXGsirqLqN2L0JDJQlwOboGHmptD5ZD6T2VmcqhTw=
-golang.zx2c4.com/wireguard v0.0.0-20250515145403-1571e0fbae8e h1:ZB5hAWug6qfyDjed7y2uJB6f1ufSJfJok753/GQ1kCA=
-golang.zx2c4.com/wireguard v0.0.0-20250515145403-1571e0fbae8e/go.mod h1:rpwXGsirqLqN2L0JDJQlwOboGHmptD5ZD6T2VmcqhTw=
+golang.zx2c4.com/wireguard v0.0.0-20250521234502-f333402bd9cb h1:whnFRlWMcXI9d+ZbWg+4sHnLp52d5yiIPUxMBSt4X9A=
+golang.zx2c4.com/wireguard v0.0.0-20250521234502-f333402bd9cb/go.mod h1:rpwXGsirqLqN2L0JDJQlwOboGHmptD5ZD6T2VmcqhTw=
 gvisor.dev/gvisor v0.0.0-20250503011706-39ed1f5ac29c h1:m/r7OM+Y2Ty1sgBQ7Qb27VgIMBW8ZZhT4gLnUyDIhzI=
 gvisor.dev/gvisor v0.0.0-20250503011706-39ed1f5ac29c/go.mod h1:3r5CMtNQMKIvBlrmM9xWUNamjKBYPOWyXOjmg5Kts3g=

tunnel/tools/ndk-compat/compat.c

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: BSD
  *
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  *
  */
 

tunnel/tools/ndk-compat/compat.h

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: BSD
  *
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  *
  */
 

ui/build.gradle.kts

@@ -21,7 +21,7 @@ android {
     namespace = pkg
     defaultConfig {
         applicationId = pkg
-        minSdk = 21
+        minSdk = 24
         targetSdk = 36
         versionCode = providers.gradleProperty("wireguardVersionCode").get().toInt()
         versionName = providers.gradleProperty("wireguardVersionName").get()

ui/src/googleplay/AndroidManifest.xml

@@ -1,4 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 

ui/src/main/AndroidManifest.xml

@@ -1,4 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:installLocation="internalOnly">

ui/src/main/java/com/wireguard/android/Application.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android

ui/src/main/java/com/wireguard/android/BootShutdownReceiver.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android

ui/src/main/java/com/wireguard/android/QuickTileService.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android
@@ -32,7 +32,6 @@ import kotlinx.coroutines.launch
  * system framework as necessary to update the appearance of the tile in the system UI, and to
  * forward click events to the application.
  */
-@RequiresApi(Build.VERSION_CODES.N)
 class QuickTileService : TileService() {
     private val onStateChangedCallback = OnStateChangedCallback()
     private val onTunnelChangedCallback = OnTunnelChangedCallback()
@@ -52,33 +51,50 @@ class QuickTileService : TileService() {
     }
 
     override fun onClick() {
-        when (val tunnel = tunnel) {
-            null -> {
-                val intent = Intent(this, MainActivity::class.java)
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-                    startActivityAndCollapse(PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_IMMUTABLE))
-                } else {
-                    @Suppress("DEPRECATION")
-                    startActivityAndCollapse(intent)
-                }
+        applicationScope.launch {
+            if (tunnel == null) {
+                Application.getTunnelManager().getTunnels()
+                updateTile()
             }
-            else -> {
-                unlockAndRun {
-                    applicationScope.launch {
-                        try {
-                            tunnel.setStateAsync(Tunnel.State.TOGGLE)
-                            updateTile()
-                        } catch (_: Throwable) {
-                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE && !Settings.canDrawOverlays(this@QuickTileService)) {
-                                val permissionIntent = Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, Uri.parse("package:$packageName"))
-                                permissionIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                                startActivityAndCollapse(PendingIntent.getActivity(this@QuickTileService, 0, permissionIntent, PendingIntent.FLAG_IMMUTABLE))
-                                return@launch
+            when (val tunnel = tunnel) {
+                null -> {
+                    Log.d(TAG, "No tunnel set, so launching main activity")
+                    val intent = Intent(this@QuickTileService, MainActivity::class.java)
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+                        startActivityAndCollapse(PendingIntent.getActivity(this@QuickTileService, 0, intent, PendingIntent.FLAG_IMMUTABLE))
+                    } else {
+                        @Suppress("DEPRECATION")
+                        startActivityAndCollapse(intent)
+                    }
+                }
+
+                else -> {
+                    unlockAndRun {
+                        applicationScope.launch {
+                            try {
+                                tunnel.setStateAsync(Tunnel.State.TOGGLE)
+                                updateTile()
+                            } catch (e: Throwable) {
+                                Log.d(TAG, "Failed to set state, so falling back", e)
+                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE && !Settings.canDrawOverlays(this@QuickTileService)) {
+                                    Log.d(TAG, "Need overlay permissions")
+                                    val permissionIntent = Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, Uri.parse("package:$packageName"))
+                                    permissionIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                    startActivityAndCollapse(
+                                        PendingIntent.getActivity(
+                                            this@QuickTileService,
+                                            0,
+                                            permissionIntent,
+                                            PendingIntent.FLAG_IMMUTABLE
+                                        )
+                                    )
+                                    return@launch
+                                }
+                                val toggleIntent = Intent(this@QuickTileService, TunnelToggleActivity::class.java)
+                                toggleIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                startActivity(toggleIntent)
                             }
-                            val toggleIntent = Intent(this@QuickTileService, TunnelToggleActivity::class.java)
-                            toggleIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                            startActivity(toggleIntent)
                         }
                     }
                 }

ui/src/main/java/com/wireguard/android/activity/BaseActivity.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.activity

ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -183,7 +183,7 @@ class LogViewerActivity : AppCompatActivity() {
             return
         Snackbar.make(
             findViewById(android.R.id.content),
-            if (exception == null) getString(R.string.log_export_success, outputFile?.fileName)
+            if (exception == null) getString(R.string.log_export_success, outputFile.fileName)
             else getString(R.string.log_export_error, ErrorMessages[exception]),
             if (exception == null) Snackbar.LENGTH_SHORT else Snackbar.LENGTH_LONG
         )

ui/src/main/java/com/wireguard/android/activity/MainActivity.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.activity
@@ -80,7 +80,7 @@ class MainActivity : BaseActivity(), FragmentManager.OnBackStackChangedListener
 
             R.id.menu_action_edit -> {
                 supportFragmentManager.commit {
-                    replace(R.id.detail_container, TunnelEditorFragment())
+                    replace(if (isTwoPaneLayout) R.id.detail_container else R.id.list_detail_container, TunnelEditorFragment())
                     setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
                     addToBackStack(null)
                 }
@@ -119,7 +119,7 @@ class MainActivity : BaseActivity(), FragmentManager.OnBackStackChangedListener
         } else if (backStackEntries == 0) {
             // Create and show a new detail fragment.
             fragmentManager.commit {
-                add(R.id.detail_container, TunnelDetailFragment())
+                add(if (isTwoPaneLayout) R.id.detail_container else R.id.list_detail_container, TunnelDetailFragment())
                 setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
                 addToBackStack(null)
             }

ui/src/main/java/com/wireguard/android/activity/SettingsActivity.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.activity
@@ -72,10 +72,6 @@ class SettingsActivity : AppCompatActivity() {
                 darkTheme?.parent?.removePreference(darkTheme)
                 --preferenceScreen.initialExpandedChildrenCount
             }
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-                val remoteApps = preferenceManager.findPreference<Preference>("allow_remote_control_intents")
-                remoteApps?.parent?.removePreference(remoteApps)
-            }
             if (AdminKnobs.disableConfigExport) {
                 val zipExporter = preferenceManager.findPreference<Preference>("zip_exporter")
                 zipExporter?.parent?.removePreference(zipExporter)

ui/src/main/java/com/wireguard/android/activity/TunnelCreatorActivity.kt

@@ -1,15 +1,11 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.activity
 
 import android.os.Bundle
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.view.children
-import androidx.fragment.app.commit
-import com.wireguard.android.fragment.TunnelEditorFragment
+import com.wireguard.android.R
 import com.wireguard.android.model.ObservableTunnel
 
 /**
@@ -18,20 +14,11 @@ import com.wireguard.android.model.ObservableTunnel
 class TunnelCreatorActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        if (supportFragmentManager.findFragmentById(android.R.id.content) == null) {
-            supportFragmentManager.commit {
-                add(android.R.id.content, TunnelEditorFragment())
-            }
-        }
+        setContentView(R.layout.tunnel_creator_activity)
     }
 
     override fun onSelectedTunnelChanged(oldTunnel: ObservableTunnel?, newTunnel: ObservableTunnel?): Boolean {
         finish()
         return true
     }
-
-    override fun onAttachedToWindow() {
-        super.onAttachedToWindow()
-        (findViewById<View?>(android.R.id.content) as? ViewGroup)?.children?.firstOrNull()?.fitsSystemWindows = true
-    }
 }

ui/src/main/java/com/wireguard/android/activity/TunnelToggleActivity.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.activity
@@ -22,7 +22,6 @@ import com.wireguard.android.backend.Tunnel
 import com.wireguard.android.util.ErrorMessages
 import kotlinx.coroutines.launch
 
-@RequiresApi(Build.VERSION_CODES.N)
 class TunnelToggleActivity : AppCompatActivity() {
     private val permissionActivityResultLauncher =
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { toggleTunnelWithPermissionsResult() }

ui/src/main/java/com/wireguard/android/activity/TvMainActivity.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -214,7 +214,10 @@ class TvMainActivity : AppCompatActivity() {
                     MaterialAlertDialogBuilder(binding.root.context).setMessage(R.string.tv_no_file_picker).setCancelable(false)
                         .setPositiveButton(android.R.string.ok) { _, _ ->
                             try {
-                                startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("market://webstoreredirect")))
+                                startActivity(Intent(Intent.ACTION_VIEW).apply {
+                                    data = Uri.parse("https://play.google.com/store/apps/details?id=com.cxinventor.file.explorer")
+                                    setPackage("com.android.vending")
+                                })
                             } catch (_: Throwable) {
                             }
                         }.show()
@@ -263,31 +266,14 @@ class TvMainActivity : AppCompatActivity() {
     private suspend fun makeStorageRoots(): Collection<KeyedFile> = withContext(Dispatchers.IO) {
         cachedRoots?.let { return@withContext it }
         val list = HashSet<KeyedFile>()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            val storageManager: StorageManager = getSystemService() ?: return@withContext list
-            list.addAll(storageManager.storageVolumes.mapNotNull { volume ->
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                    volume.directory?.let { KeyedFile(it, volume.getDescription(this@TvMainActivity)) }
-                } else {
-                    KeyedFile((StorageVolume::class.java.getMethod("getPathFile").invoke(volume) as File), volume.getDescription(this@TvMainActivity))
-                }
-            })
-        } else {
-            @Suppress("DEPRECATION")
-            list.add(KeyedFile(Environment.getExternalStorageDirectory()))
-            try {
-                File("/storage").listFiles()?.forEach {
-                    if (!it.isDirectory) return@forEach
-                    try {
-                        if (Environment.isExternalStorageRemovable(it)) {
-                            list.add(KeyedFile(it))
-                        }
-                    } catch (_: Throwable) {
-                    }
-                }
-            } catch (_: Throwable) {
+        val storageManager: StorageManager = getSystemService() ?: return@withContext list
+        list.addAll(storageManager.storageVolumes.mapNotNull { volume ->
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                volume.directory?.let { KeyedFile(it, volume.getDescription(this@TvMainActivity)) }
+            } else {
+                KeyedFile((StorageVolume::class.java.getMethod("getPathFile").invoke(volume) as File), volume.getDescription(this@TvMainActivity))
             }
-        }
+        })
         cachedRoots = list
         list
     }

ui/src/main/java/com/wireguard/android/configStore/ConfigStore.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.configStore

ui/src/main/java/com/wireguard/android/configStore/FileConfigStore.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.configStore

ui/src/main/java/com/wireguard/android/databinding/BindingAdapters.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.databinding

ui/src/main/java/com/wireguard/android/databinding/ItemChangeListener.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.databinding

ui/src/main/java/com/wireguard/android/databinding/Keyed.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.databinding

ui/src/main/java/com/wireguard/android/databinding/ObservableKeyedArrayList.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.databinding

ui/src/main/java/com/wireguard/android/databinding/ObservableKeyedRecyclerViewAdapter.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.databinding

ui/src/main/java/com/wireguard/android/databinding/ObservableSortedKeyedArrayList.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.databinding

ui/src/main/java/com/wireguard/android/fragment/AddTunnelsSheet.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.fragment

ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.fragment

ui/src/main/java/com/wireguard/android/fragment/BaseFragment.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.fragment

ui/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.fragment

ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.fragment

ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.fragment

ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.fragment

ui/src/main/java/com/wireguard/android/model/ApplicationData.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.model

ui/src/main/java/com/wireguard/android/model/ObservableTunnel.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.model

ui/src/main/java/com/wireguard/android/model/TunnelComparator.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

ui/src/main/java/com/wireguard/android/model/TunnelManager.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.model
@@ -221,10 +221,9 @@ class TunnelManager(private val configStore: ConfigStore) : BaseObservable() {
                     manager.refreshTunnelStates()
                     return@launch
                 }
-                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M || !UserKnobs.allowRemoteControlIntents.first())
+                if (!UserKnobs.allowRemoteControlIntents.first())
                     return@launch
-                val state: Tunnel.State
-                state = when (action) {
+                val state = when (action) {
                     "com.wireguard.android.action.SET_TUNNEL_UP" -> Tunnel.State.UP
                     "com.wireguard.android.action.SET_TUNNEL_DOWN" -> Tunnel.State.DOWN
                     else -> return@launch

ui/src/main/java/com/wireguard/android/preference/DonatePreference.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -15,6 +15,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.wireguard.android.R
 import com.wireguard.android.updater.Updater
 import com.wireguard.android.util.ErrorMessages
+import androidx.core.net.toUri
 
 class DonatePreference(context: Context, attrs: AttributeSet?) : Preference(context, attrs) {
     override fun getSummary() = context.getString(R.string.donate_summary)
@@ -32,7 +33,7 @@ class DonatePreference(context: Context, attrs: AttributeSet?) : Preference(cont
         }
 
         val intent = Intent(Intent.ACTION_VIEW)
-        intent.data = Uri.parse("https://www.wireguard.com/donations/")
+        intent.data = "https://www.wireguard.com/donations/".toUri()
         try {
             context.startActivity(intent)
         } catch (e: Throwable) {

ui/src/main/java/com/wireguard/android/preference/KernelModuleEnablerPreference.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.preference

ui/src/main/java/com/wireguard/android/preference/PreferencesPreferenceDataStore.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

ui/src/main/java/com/wireguard/android/preference/QuickTilePreference.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

ui/src/main/java/com/wireguard/android/preference/ToolsInstallerPreference.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.preference

ui/src/main/java/com/wireguard/android/preference/VersionPreference.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.preference

ui/src/main/java/com/wireguard/android/preference/ZipExporterPreference.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.preference

ui/src/main/java/com/wireguard/android/updater/Ed25519.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * Copyright 2017 Google Inc.
  * SPDX-License-Identifier: Apache-2.0
  */

ui/src/main/java/com/wireguard/android/updater/SnackbarUpdateShower.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

ui/src/main/java/com/wireguard/android/updater/Updater.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.updater
@@ -264,7 +264,7 @@ object Updater {
             throw IOException("Update could not be fetched: ${connection.responseCode}")
 
         var downloadedByteLen: ULong = 0UL
-        val totalByteLen = (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) connection.contentLengthLong else connection.contentLength).toLong().toULong()
+        val totalByteLen = connection.contentLengthLong.toULong()
         val fileBytes = ByteArray(1024 * 32 /* 32 KiB */)
         val digest = MessageDigest.getInstance("SHA-256")
         emitProgress(Progress.Downloading(downloadedByteLen, totalByteLen), true)
@@ -376,6 +376,15 @@ object Updater {
         if (installerIsGooglePlay(context))
             return
 
+        if (BuildConfig.BUILD_TYPE == "googleplay") {
+            if (installer(context).isNotEmpty()) {
+                applicationScope.launch {
+                    emitProgress(Progress.Corrupt(null))
+                }
+            }
+            return
+        }
+
         if (if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
                 @Suppress("DEPRECATION")
                 context.packageManager.getPackageInfo(context.packageName, PackageManager.GET_PERMISSIONS)

ui/src/main/java/com/wireguard/android/util/AdminKnobs.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

ui/src/main/java/com/wireguard/android/util/BiometricAuthenticator.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

ui/src/main/java/com/wireguard/android/util/ClipboardUtils.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.util

ui/src/main/java/com/wireguard/android/util/DownloadsFileSaver.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.util

ui/src/main/java/com/wireguard/android/util/ErrorMessages.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.util

ui/src/main/java/com/wireguard/android/util/Extensions.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

ui/src/main/java/com/wireguard/android/util/QrCodeFromFileScanner.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -29,7 +29,6 @@ class QrCodeFromFileScanner(
     private val contentResolver: ContentResolver,
     private val reader: Reader,
 ) {
-
     private fun scanBitmapForResult(source: Bitmap): Result {
         val width = source.width
         val height = source.height
@@ -40,55 +39,28 @@ class QrCodeFromFileScanner(
         return reader.decode(bBitmap, mapOf(DecodeHintType.TRY_HARDER to true))
     }
 
-    private fun downscaleBitmap(source: Bitmap, scaledSize: Int): Bitmap {
-
-        val originalWidth = source.width
-        val originalHeight = source.height
-
-        var newWidth = -1
-        var newHeight = -1
-        val multFactor: Float
-
-        when {
-            originalHeight > originalWidth -> {
-                newHeight = scaledSize
-                multFactor = originalWidth.toFloat() / originalHeight.toFloat()
-                newWidth = (newHeight * multFactor).toInt()
-            }
-
-            originalWidth > originalHeight -> {
-                newWidth = scaledSize
-                multFactor = originalHeight.toFloat() / originalWidth.toFloat()
-                newHeight = (newWidth * multFactor).toInt()
-            }
-
-            originalHeight == originalWidth -> {
-                newHeight = scaledSize
-                newWidth = scaledSize
-            }
-        }
-        return Bitmap.createScaledBitmap(source, newWidth, newHeight, false)
-    }
-
     private fun doScan(data: Uri): Result {
         Log.d(TAG, "Starting to scan an image: $data")
         contentResolver.openInputStream(data).use { inputStream ->
-            val originalBitmap = BitmapFactory.decodeStream(inputStream)
-                ?: throw IllegalArgumentException("Can't decode stream to Bitmap")
-
-            return try {
-                scanBitmapForResult(originalBitmap).also {
-                    Log.d(TAG, "Found result in original image")
+            var bitmap: Bitmap? = null
+            var firstException: Throwable? = null
+            for (i in arrayOf(1, 2, 4, 8, 16, 32, 64, 128)) {
+                try {
+                    val options = BitmapFactory.Options()
+                    options.inSampleSize = i
+                    bitmap = BitmapFactory.decodeStream(inputStream, null, options)
+                        ?: throw IllegalArgumentException("Can't decode stream for bitmap")
+                    return scanBitmapForResult(bitmap)
+                } catch (e: Throwable) {
+                    bitmap?.recycle()
+                    System.gc()
+                    Log.e(TAG, "Original image scan at scale factor $i finished with error: $e")
+                    if (firstException == null)
+                        firstException = e
                 }
-            } catch (e: Exception) {
-                Log.e(TAG, "Original image scan finished with error: $e, will try downscaled image")
-                val scaleBitmap = downscaleBitmap(originalBitmap, 500)
-                scanBitmapForResult(originalBitmap).also { scaleBitmap.recycle() }
-            } finally {
-                originalBitmap.recycle()
             }
+            throw Exception(firstException)
         }
-
     }
 
     /**

ui/src/main/java/com/wireguard/android/util/QuantityFormatter.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -31,9 +31,6 @@ object QuantityFormatter {
     fun formatEpochAgo(epochMillis: Long): String {
         var span = (System.currentTimeMillis() - epochMillis) / 1000
 
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N)
-            return Application.get().applicationContext.getString(R.string.latest_handshake_ago, span.seconds.toString())
-
         if (span <= 0L)
             return RelativeDateTimeFormatter.getInstance().format(RelativeDateTimeFormatter.Direction.PLAIN, RelativeDateTimeFormatter.AbsoluteUnit.NOW)
         val measureFormat = MeasureFormat.getInstance(Locale.getDefault(), MeasureFormat.FormatWidth.WIDE)

ui/src/main/java/com/wireguard/android/util/TunnelImporter.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

ui/src/main/java/com/wireguard/android/util/UserKnobs.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

ui/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.viewmodel

ui/src/main/java/com/wireguard/android/viewmodel/InterfaceProxy.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.viewmodel

ui/src/main/java/com/wireguard/android/viewmodel/PeerProxy.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.viewmodel

ui/src/main/java/com/wireguard/android/widget/KeyInputFilter.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.widget

ui/src/main/java/com/wireguard/android/widget/MultiselectableRelativeLayout.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.widget

ui/src/main/java/com/wireguard/android/widget/NameInputFilter.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.widget

ui/src/main/java/com/wireguard/android/widget/SlashDrawable.kt

@@ -1,6 +1,6 @@
 /*
  * Copyright © 2018 The Android Open Source Project
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.widget
@@ -15,7 +15,6 @@ import androidx.annotation.ColorInt
 import androidx.annotation.IntRange
 import androidx.annotation.RequiresApi
 
-@RequiresApi(Build.VERSION_CODES.N)
 class SlashDrawable(private val mDrawable: Drawable) : Drawable() {
     private val mPaint = Paint(Paint.ANTI_ALIAS_FLAG)
     private val mPath = Path()

ui/src/main/java/com/wireguard/android/widget/ToggleSwitch.kt

@@ -1,6 +1,6 @@
 /*
  * Copyright © 2013 The Android Open Source Project
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.widget

ui/src/main/java/com/wireguard/android/widget/TvCardView.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */