From f3230fc8f99244156ee13c30d297cdb8587a8b81 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Thu, 26 May 2022 05:59:42 +0530
Subject: idea: squelch XML codestyle warning

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 .idea/codeStyles/Project.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3eb23b6b..d19645e3 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -66,9 +66,6 @@
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="10" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
     <codeStyleSettings language="JAVA">
       <option name="METHOD_ANNOTATION_WRAP" value="0" />
       <option name="FIELD_ANNOTATION_WRAP" value="0" />
-- 
cgit v1.2.3


From 1bb8a10633e4b085e4ba24fcdb5fe393e4c2d4a0 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Thu, 26 May 2022 05:44:27 +0530
Subject: ui: remove unnecessary boolean check

This check was added in 3c31c340d86f when the kernel module loader was
introduced into the app lifecycle, to avoid attempting to start a root shell
twice. When the module loader was removed in a03ad51622d338d1c, this flag
was accidentally left in when it should have been deleted.

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 ui/src/main/java/com/wireguard/android/Application.kt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ui/src/main/java/com/wireguard/android/Application.kt b/ui/src/main/java/com/wireguard/android/Application.kt
index d9dcb637..f26ca926 100644
--- a/ui/src/main/java/com/wireguard/android/Application.kt
+++ b/ui/src/main/java/com/wireguard/android/Application.kt
@@ -64,11 +64,9 @@ class Application : android.app.Application() {
 
     private suspend fun determineBackend(): Backend {
         var backend: Backend? = null
-        var didStartRootShell = false
         if (UserKnobs.enableKernelModule.first() && WgQuickBackend.hasKernelSupport()) {
             try {
-                if (!didStartRootShell)
-                    rootShell.start()
+                rootShell.start()
                 val wgQuickBackend = WgQuickBackend(applicationContext, rootShell, toolsInstaller)
                 wgQuickBackend.setMultipleTunnels(UserKnobs.multipleTunnels.first())
                 backend = wgQuickBackend
-- 
cgit v1.2.3


From b3112ab0bdfe6a3b62db79637d2dc3dbd33717d3 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Thu, 26 May 2022 05:24:15 +0530
Subject: gradle: bump to 7.4.2

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 build.gradle                             |   4 ++--
 gradle/wrapper/gradle-wrapper.jar        | Bin 59536 -> 59821 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 02647c0c..17f59fd9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,8 +62,8 @@ task clean(type: Delete) {
 
 tasks {
     wrapper {
-        gradleVersion = "7.3.3"
-        distributionSha256Sum = "b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302"
+        gradleVersion = "7.4.2"
+        distributionSha256Sum = "29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda"
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180f..41d9927a 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 59250647..5c51a4ac 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-- 
cgit v1.2.3


From 059bf881418c18c9af6031cf0000a794f2b9eb58 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Thu, 26 May 2022 05:32:33 +0530
Subject: gradle: bump AGP and Kotlin

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 settings.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index 574688e0..9430d416 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
 pluginManagement {
-    def agpVersion = "7.1.3"
-    def kotlinVersion = "1.6.20"
+    def agpVersion = "7.2.1"
+    def kotlinVersion = "1.6.21"
     repositories {
         gradlePluginPortal()
         google()
-- 
cgit v1.2.3


From 50b21e95c383e7c64ac64ffd8d774631252b2c4c Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Thu, 26 May 2022 05:37:16 +0530
Subject: gradle: bump ConstraintLayout and MDC

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 17f59fd9..8615fb43 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         appcompatVersion = '1.4.1'
         biometricVersion = '1.1.0'
         collectionVersion = '1.2.0'
-        constraintLayoutVersion = '2.1.3'
+        constraintLayoutVersion = '2.1.4'
         coordinatorLayoutVersion = '1.2.0'
         coreKtxVersion = '1.7.0'
         coroutinesVersion = '1.6.1'
@@ -15,7 +15,7 @@ buildscript {
         jsr305Version = '3.0.2'
         junitVersion = '4.13.2'
         lifecycleRuntimeKtxVersion = '2.4.1'
-        materialComponentsVersion = '1.5.0'
+        materialComponentsVersion = '1.6.0'
         preferenceVersion = '1.2.0'
         zxingEmbeddedVersion = '4.3.0'
 
-- 
cgit v1.2.3


From 81c571f0c700f4da438ae06e3a61cfa984374785 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Thu, 26 May 2022 05:59:17 +0530
Subject: ui: normalise icon tints and remove unused drawable

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 ui/src/main/res/drawable/ic_action_add_white.xml          |  7 ++++---
 ui/src/main/res/drawable/ic_action_delete.xml             |  3 ++-
 ui/src/main/res/drawable/ic_action_edit.xml               |  3 ++-
 ui/src/main/res/drawable/ic_action_edit_white.xml         |  9 ---------
 ui/src/main/res/drawable/ic_action_generate.xml           |  3 ++-
 ui/src/main/res/drawable/ic_action_open.xml               | 10 ++++++++++
 ui/src/main/res/drawable/ic_action_open_white.xml         |  9 ---------
 ui/src/main/res/drawable/ic_action_save.xml               |  3 ++-
 ui/src/main/res/drawable/ic_action_scan_qr_code.xml       | 10 ++++++++++
 ui/src/main/res/drawable/ic_action_scan_qr_code_white.xml |  9 ---------
 ui/src/main/res/drawable/ic_action_select_all.xml         |  3 ++-
 ui/src/main/res/drawable/ic_action_share_white.xml        |  1 +
 ui/src/main/res/drawable/ic_arrow_back.xml                |  3 ++-
 ui/src/main/res/drawable/ic_settings.xml                  |  3 ++-
 ui/src/main/res/layout/add_tunnels_bottom_sheet.xml       |  4 ++--
 15 files changed, 41 insertions(+), 39 deletions(-)
 delete mode 100644 ui/src/main/res/drawable/ic_action_edit_white.xml
 create mode 100644 ui/src/main/res/drawable/ic_action_open.xml
 delete mode 100644 ui/src/main/res/drawable/ic_action_open_white.xml
 create mode 100644 ui/src/main/res/drawable/ic_action_scan_qr_code.xml
 delete mode 100644 ui/src/main/res/drawable/ic_action_scan_qr_code_white.xml

diff --git a/ui/src/main/res/drawable/ic_action_add_white.xml b/ui/src/main/res/drawable/ic_action_add_white.xml
index 18fe19db..1ea440df 100644
--- a/ui/src/main/res/drawable/ic_action_add_white.xml
+++ b/ui/src/main/res/drawable/ic_action_add_white.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="?attr/colorOnSecondary"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
 </vector>
diff --git a/ui/src/main/res/drawable/ic_action_delete.xml b/ui/src/main/res/drawable/ic_action_delete.xml
index 51517c42..73eb7352 100644
--- a/ui/src/main/res/drawable/ic_action_delete.xml
+++ b/ui/src/main/res/drawable/ic_action_delete.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?attr/colorOnPrimary"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z" />
 </vector>
diff --git a/ui/src/main/res/drawable/ic_action_edit.xml b/ui/src/main/res/drawable/ic_action_edit.xml
index 8d8acf85..d40c78d9 100644
--- a/ui/src/main/res/drawable/ic_action_edit.xml
+++ b/ui/src/main/res/drawable/ic_action_edit.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?attr/colorOnPrimary"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
 </vector>
diff --git a/ui/src/main/res/drawable/ic_action_edit_white.xml b/ui/src/main/res/drawable/ic_action_edit_white.xml
deleted file mode 100644
index 212fc72c..00000000
--- a/ui/src/main/res/drawable/ic_action_edit_white.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="?attr/colorOnSecondary"
-        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
-</vector>
diff --git a/ui/src/main/res/drawable/ic_action_generate.xml b/ui/src/main/res/drawable/ic_action_generate.xml
index 7324eae4..51d26aed 100644
--- a/ui/src/main/res/drawable/ic_action_generate.xml
+++ b/ui/src/main/res/drawable/ic_action_generate.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z" />
 </vector>
diff --git a/ui/src/main/res/drawable/ic_action_open.xml b/ui/src/main/res/drawable/ic_action_open.xml
new file mode 100644
index 00000000..c9fd6fba
--- /dev/null
+++ b/ui/src/main/res/drawable/ic_action_open.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6L6,2zM13,9L13,3.5L18.5,9L13,9z" />
+</vector>
diff --git a/ui/src/main/res/drawable/ic_action_open_white.xml b/ui/src/main/res/drawable/ic_action_open_white.xml
deleted file mode 100644
index 91075680..00000000
--- a/ui/src/main/res/drawable/ic_action_open_white.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="?attr/colorOnSecondary"
-        android:pathData="M6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6L6,2zM13,9L13,3.5L18.5,9L13,9z" />
-</vector>
diff --git a/ui/src/main/res/drawable/ic_action_save.xml b/ui/src/main/res/drawable/ic_action_save.xml
index ed98e85a..6e618edb 100644
--- a/ui/src/main/res/drawable/ic_action_save.xml
+++ b/ui/src/main/res/drawable/ic_action_save.xml
@@ -2,9 +2,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?attr/colorOnPrimary"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z" />
 </vector>
diff --git a/ui/src/main/res/drawable/ic_action_scan_qr_code.xml b/ui/src/main/res/drawable/ic_action_scan_qr_code.xml
new file mode 100644
index 00000000..4522ae46
--- /dev/null
+++ b/ui/src/main/res/drawable/ic_action_scan_qr_code.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M4,4H10V10H4V4M20,4V10H14V4H20M14,15H16V13H14V11H16V13H18V11H20V13H18V15H20V18H18V20H16V18H13V20H11V16H14V15M16,15V18H18V15H16M4,20V14H10V20H4M6,6V8H8V6H6M16,6V8H18V6H16M6,16V18H8V16H6M4,11H6V13H4V11M9,11H13V15H11V13H9V11M11,6H13V10H11V6M2,2V6H0V2A2,2 0 0,1 2,0H6V2H2M22,0A2,2 0 0,1 24,2V6H22V2H18V0H22M2,18V22H6V24H2A2,2 0 0,1 0,22V18H2M22,22V18H24V22A2,2 0 0,1 22,24H18V22H22Z" />
+</vector>
diff --git a/ui/src/main/res/drawable/ic_action_scan_qr_code_white.xml b/ui/src/main/res/drawable/ic_action_scan_qr_code_white.xml
deleted file mode 100644
index a5ede695..00000000
--- a/ui/src/main/res/drawable/ic_action_scan_qr_code_white.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="?attr/colorOnSecondary"
-        android:pathData="M4,4H10V10H4V4M20,4V10H14V4H20M14,15H16V13H14V11H16V13H18V11H20V13H18V15H20V18H18V20H16V18H13V20H11V16H14V15M16,15V18H18V15H16M4,20V14H10V20H4M6,6V8H8V6H6M16,6V8H18V6H16M6,16V18H8V16H6M4,11H6V13H4V11M9,11H13V15H11V13H9V11M11,6H13V10H11V6M2,2V6H0V2A2,2 0 0,1 2,0H6V2H2M22,0A2,2 0 0,1 24,2V6H22V2H18V0H22M2,18V22H6V24H2A2,2 0 0,1 0,22V18H2M22,22V18H24V22A2,2 0 0,1 22,24H18V22H22Z" />
-</vector>
diff --git a/ui/src/main/res/drawable/ic_action_select_all.xml b/ui/src/main/res/drawable/ic_action_select_all.xml
index 43f5f15e..490ca715 100644
--- a/ui/src/main/res/drawable/ic_action_select_all.xml
+++ b/ui/src/main/res/drawable/ic_action_select_all.xml
@@ -2,9 +2,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?attr/colorOnPrimary"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M3 5L5 5 5 3C3.9 3 3 3.9 3 5Zm0 8l2 0 0 -2 -2 0 0 2zm4 8l2 0 0 -2 -2 0 0 2zM3 9L5 9 5 7 3 7 3 9Zm10 -6l-2 0 0 2 2 0 0 -2zm6 0l0 2 2 0C21 3.9 20.1 3 19 3ZM5 21L5 19 3 19c0 1.1 0.9 2 2 2zm-2 -4l2 0 0 -2 -2 0 0 2zM9 3L7 3 7 5 9 5 9 3Zm2 18l2 0 0 -2 -2 0 0 2zm8 -8l2 0 0 -2 -2 0 0 2zm0 8c1.1 0 2 -0.9 2 -2l-2 0 0 2zm0 -12l2 0 0 -2 -2 0 0 2zm0 8l2 0 0 -2 -2 0 0 2zm-4 4l2 0 0 -2 -2 0 0 2zm0 -16l2 0 0 -2 -2 0 0 2zM7 17L17 17 17 7 7 7 7 17Zm2 -8l6 0 0 6 -6 0 0 -6z" />
 </vector>
diff --git a/ui/src/main/res/drawable/ic_action_share_white.xml b/ui/src/main/res/drawable/ic_action_share_white.xml
index 70843cf3..04ee5b74 100644
--- a/ui/src/main/res/drawable/ic_action_share_white.xml
+++ b/ui/src/main/res/drawable/ic_action_share_white.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/ui/src/main/res/drawable/ic_arrow_back.xml b/ui/src/main/res/drawable/ic_arrow_back.xml
index 0d549893..05d8f7d7 100644
--- a/ui/src/main/res/drawable/ic_arrow_back.xml
+++ b/ui/src/main/res/drawable/ic_arrow_back.xml
@@ -6,9 +6,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M19,11H7.83l4.88,-4.88c0.39,-0.39 0.39,-1.03 0,-1.42 -0.39,-0.39 -1.02,-0.39 -1.41,0l-6.59,6.59c-0.39,0.39 -0.39,1.02 0,1.41l6.59,6.59c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L7.83,13H19c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1z" />
 </vector>
diff --git a/ui/src/main/res/drawable/ic_settings.xml b/ui/src/main/res/drawable/ic_settings.xml
index 6d1cfa71..af9f2634 100644
--- a/ui/src/main/res/drawable/ic_settings.xml
+++ b/ui/src/main/res/drawable/ic_settings.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?android:attr/colorForeground"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
 </vector>
diff --git a/ui/src/main/res/layout/add_tunnels_bottom_sheet.xml b/ui/src/main/res/layout/add_tunnels_bottom_sheet.xml
index 68f186b6..9ed57ac6 100644
--- a/ui/src/main/res/layout/add_tunnels_bottom_sheet.xml
+++ b/ui/src/main/res/layout/add_tunnels_bottom_sheet.xml
@@ -20,7 +20,7 @@
         android:text="@string/create_from_file"
         android:textAlignment="viewStart"
         android:textColor="?attr/colorOnSurface"
-        app:icon="@drawable/ic_action_open_white"
+        app:icon="@drawable/ic_action_open"
         app:iconPadding="@dimen/bottom_sheet_icon_padding"
         app:iconTint="?attr/colorSecondary"
         app:layout_constraintBottom_toTopOf="@+id/create_from_qrcode"
@@ -44,7 +44,7 @@
         android:text="@string/create_from_qr_code"
         android:textAlignment="viewStart"
         android:textColor="?attr/colorOnSurface"
-        app:icon="@drawable/ic_action_scan_qr_code_white"
+        app:icon="@drawable/ic_action_scan_qr_code"
         app:iconPadding="@dimen/bottom_sheet_icon_padding"
         app:iconTint="?attr/colorSecondary"
         app:layout_constraintBottom_toBottomOf="@+id/create_empty"
-- 
cgit v1.2.3


From 5d14caf3b26abaf8dcffdaa83e104e512df4d65b Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Thu, 26 May 2022 06:00:29 +0530
Subject: ui: move default style to Material3 with Dynamic Colors

The TV theme has been kept as-is since Material You guidance around this
is a bit scarce at the moment.

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 ui/src/main/java/com/wireguard/android/Application.kt |  2 ++
 .../android/fragment/AppListDialogFragment.kt         |  3 ++-
 .../android/fragment/ConfigNamingDialogFragment.kt    |  3 ++-
 ui/src/main/res/values/styles.xml                     | 19 +------------------
 ui/src/main/res/values/tv_styles.xml                  | 18 ++++++++++++++++--
 5 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/ui/src/main/java/com/wireguard/android/Application.kt b/ui/src/main/java/com/wireguard/android/Application.kt
index f26ca926..7573bdad 100644
--- a/ui/src/main/java/com/wireguard/android/Application.kt
+++ b/ui/src/main/java/com/wireguard/android/Application.kt
@@ -16,6 +16,7 @@ import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.PreferenceDataStoreFactory
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.preferencesDataStoreFile
+import com.google.android.material.color.DynamicColors
 import com.wireguard.android.backend.Backend
 import com.wireguard.android.backend.GoBackend
 import com.wireguard.android.backend.WgQuickBackend
@@ -86,6 +87,7 @@ class Application : android.app.Application() {
     override fun onCreate() {
         Log.i(TAG, USER_AGENT)
         super.onCreate()
+        DynamicColors.applyToActivitiesIfAvailable(this)
         rootShell = RootShell(applicationContext)
         toolsInstaller = ToolsInstaller(applicationContext, rootShell)
         preferencesDataStore = PreferenceDataStoreFactory.create { applicationContext.preferencesDataStoreFile("settings") }
diff --git a/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt
index f6f57ddb..1a40a1cd 100644
--- a/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt
+++ b/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt
@@ -15,6 +15,7 @@ import androidx.databinding.Observable
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.setFragmentResult
 import androidx.lifecycle.lifecycleScope
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.tabs.TabLayout
 import com.wireguard.android.BR
 import com.wireguard.android.R
@@ -88,7 +89,7 @@ class AppListDialogFragment : DialogFragment() {
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val alertDialogBuilder = AlertDialog.Builder(requireActivity())
+        val alertDialogBuilder = MaterialAlertDialogBuilder(requireActivity())
         val binding = AppListDialogFragmentBinding.inflate(requireActivity().layoutInflater, null, false)
         binding.executePendingBindings()
         alertDialogBuilder.setView(binding.root)
diff --git a/ui/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.kt
index d20f21c6..0c4e9d20 100644
--- a/ui/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.kt
+++ b/ui/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.kt
@@ -12,6 +12,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.core.content.getSystemService
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.textfield.TextInputEditText
 import com.wireguard.android.Application
 import com.wireguard.android.R
@@ -64,7 +65,7 @@ class ConfigNamingDialogFragment : DialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val activity = requireActivity()
         imm = activity.getSystemService()
-        val alertDialogBuilder = AlertDialog.Builder(activity)
+        val alertDialogBuilder = MaterialAlertDialogBuilder(activity)
         alertDialogBuilder.setTitle(R.string.import_from_qr_code)
         binding = ConfigNamingDialogFragmentBinding.inflate(activity.layoutInflater, null, false)
         binding?.apply {
diff --git a/ui/src/main/res/values/styles.xml b/ui/src/main/res/values/styles.xml
index b90f111f..396f156c 100644
--- a/ui/src/main/res/values/styles.xml
+++ b/ui/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="WireGuardTheme" parent="Theme.MaterialComponents.DayNight">
+    <style name="WireGuardTheme" parent="Theme.Material3.DayNight">
         <item name="colorPrimary">@color/primary_color</item>
         <item name="colorOnPrimary">@color/color_control_normal</item>
         <item name="colorPrimaryDark">@color/primary_color</item>
@@ -17,9 +17,6 @@
         <item name="elevationOverlayEnabled">true</item>
         <item name="android:statusBarColor">@color/status_bar_color</item>
         <item name="android:windowBackground">@color/primary_color</item>
-        <item name="alertDialogTheme">@style/AppTheme.Dialog</item>
-        <item name="materialAlertDialogTheme">@style/AppTheme.Dialog</item>
-        <item name="textInputStyle">@style/TextInputLayoutBase</item>
         <item name="materialCardViewStyle">@style/AppTheme.MaterialCardView</item>
     </style>
 
@@ -32,12 +29,6 @@
         <item name="cardBackgroundColor">?attr/elevationOverlayColor</item>
     </style>
 
-    <style name="AppTheme.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
-        <item name="colorPrimary">@color/secondary_color</item>
-        <item name="colorSecondary">@color/secondary_color</item>
-        <item name="android:windowBackground">?attr/colorBackground</item>
-    </style>
-
     <style name="BottomSheetDialogTheme" parent="ThemeOverlay.MaterialComponents.BottomSheetDialog">
         <item name="android:windowIsFloating">false</item>
         <item name="android:navigationBarColor">?attr/colorBackground</item>
@@ -70,12 +61,4 @@
     <style name="ThemeOverlay.AppTheme.TextInputEditText.OutlinedBox" parent="ThemeOverlay.MaterialComponents.TextInputEditText.OutlinedBox">
         <item name="colorControlActivated">@color/color_control_normal</item>
     </style>
-
-    <style name="TextInputLayoutBase" parent="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
-        <item name="boxStrokeColor">?attr/colorSecondary</item>
-        <item name="hintTextColor">?attr/colorOnPrimary</item>
-        <item name="materialThemeOverlay">
-            @style/ThemeOverlay.AppTheme.TextInputEditText.OutlinedBox
-        </item>
-    </style>
 </resources>
diff --git a/ui/src/main/res/values/tv_styles.xml b/ui/src/main/res/values/tv_styles.xml
index c5477f6a..536ca752 100644
--- a/ui/src/main/res/values/tv_styles.xml
+++ b/ui/src/main/res/values/tv_styles.xml
@@ -16,12 +16,26 @@
         <item name="elevationOverlayEnabled">false</item>
         <item name="android:statusBarColor">@color/tv_primary_color</item>
         <item name="android:windowBackground">@color/tv_primary_color</item>
-        <item name="alertDialogTheme">@style/AppTheme.Dialog</item>
-        <item name="materialAlertDialogTheme">@style/AppTheme.Dialog</item>
+        <item name="alertDialogTheme">@style/TvTheme.Dialog</item>
+        <item name="materialAlertDialogTheme">@style/TvTheme.Dialog</item>
         <item name="textInputStyle">@style/TextInputLayoutBase</item>
         <item name="materialCardViewStyle">@style/TvTheme.MaterialCardView</item>
     </style>
 
+    <style name="TextInputLayoutBase" parent="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+        <item name="boxStrokeColor">?attr/colorSecondary</item>
+        <item name="hintTextColor">?attr/colorOnPrimary</item>
+        <item name="materialThemeOverlay">
+            @style/ThemeOverlay.AppTheme.TextInputEditText.OutlinedBox
+        </item>
+    </style>
+
+    <style name="TvTheme.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
+        <item name="colorPrimary">@color/secondary_color</item>
+        <item name="colorSecondary">@color/secondary_color</item>
+        <item name="android:windowBackground">?attr/colorBackground</item>
+    </style>
+
     <style name="TvTheme.MaterialCardView" parent="Widget.MaterialComponents.CardView">
         <item name="cornerRadius">4dp</item>
         <item name="cardElevation">8dp</item>
-- 
cgit v1.2.3


From 38cb184cf8b199ab468986f6a74159f8d4059a2a Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Thu, 26 May 2022 06:40:17 +0530
Subject: ui: reorder constraints to fix detail fragment overlap

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 ui/src/main/res/layout/tunnel_detail_fragment.xml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ui/src/main/res/layout/tunnel_detail_fragment.xml b/ui/src/main/res/layout/tunnel_detail_fragment.xml
index 8e34f082..7a962509 100644
--- a/ui/src/main/res/layout/tunnel_detail_fragment.xml
+++ b/ui/src/main/res/layout/tunnel_detail_fragment.xml
@@ -221,6 +221,7 @@
                         style="@style/DetailText"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_marginBottom="8dp"
                         android:contentDescription="@string/listen_port"
                         android:nextFocusRight="@id/mtu_text"
                         android:nextFocusUp="@id/dns_search_domains_text"
@@ -229,6 +230,7 @@
                         android:onClick="@{ClipboardUtils::copyTextView}"
                         android:text="@{config.interface.listenPort}"
                         android:visibility="@{!config.interface.listenPort.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}"
+                        app:layout_constraintBottom_toTopOf="@id/applications_label"
                         app:layout_constraintEnd_toStartOf="@id/mtu_label"
                         app:layout_constraintHorizontal_weight="0.5"
                         app:layout_constraintStart_toStartOf="parent"
@@ -254,6 +256,7 @@
                         style="@style/DetailText"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_marginBottom="8dp"
                         android:contentDescription="@string/mtu"
                         android:nextFocusLeft="@id/listen_port_text"
                         android:nextFocusUp="@id/dns_servers_text"
@@ -261,6 +264,7 @@
                         android:onClick="@{ClipboardUtils::copyTextView}"
                         android:text="@{config.interface.mtu}"
                         android:visibility="@{!config.interface.mtu.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}"
+                        app:layout_constraintBottom_toTopOf="@id/applications_label"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintHorizontal_weight="0.5"
                         app:layout_constraintStart_toEndOf="@id/listen_port_label"
@@ -276,8 +280,8 @@
                         android:labelFor="@+id/applications_text"
                         android:text="@string/applications"
                         android:visibility="@{config.interface.includedApplications.isEmpty() &amp;&amp; config.interface.excludedApplications.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/listen_port_text" />
+                        app:layout_constraintBottom_toTopOf="@id/applications_text"
+                        app:layout_constraintStart_toStartOf="parent" />
 
                     <TextView
                         android:id="@+id/applications_text"
@@ -291,8 +295,8 @@
                         android:onClick="@{ClipboardUtils::copyTextView}"
                         android:text="@{config.interface.includedApplications.isEmpty() ? @plurals/n_excluded_applications(config.interface.excludedApplications.size(), config.interface.excludedApplications.size()) : @plurals/n_included_applications(config.interface.includedApplications.size(), config.interface.includedApplications.size())}"
                         android:visibility="@{config.interface.includedApplications.isEmpty() &amp;&amp; config.interface.excludedApplications.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
+                        app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/applications_label"
                         tools:text="8 excluded" />
                 </androidx.constraintlayout.widget.ConstraintLayout>
             </com.google.android.material.card.MaterialCardView>
-- 
cgit v1.2.3


From 8d33b648cc3070a7ac0671d6b6edc68bd6ab48a3 Mon Sep 17 00:00:00 2001
From: Lucas Lee Jing Yi <lucasleeeeeeeee@gmail.com>
Date: Wed, 15 Jun 2022 10:59:55 +0800
Subject: gradle: remove duplicate useAndroidX entry

Signed-off-by: Lucas Lee Jing Yi <lucasleeeeeeeee@gmail.com>
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 gradle.properties | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index b91f5409..3efc9b38 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,9 +18,6 @@ org.gradle.jvmargs=-Xmx1536m
 # Turn off AP discovery in compile path to enable compile avoidance
 kapt.include.compile.classpath=false
 
-# Enable AndroidX
-android.useAndroidX=true
-
 # Enable non-transitive R class namespacing where each library only contains
 # references to the resources it declares instead of declarations plus all
 # transitive dependency references.
-- 
cgit v1.2.3


From 960bc99f5ef2806cbfe38f99f750f8f4510d623b Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Wed, 15 Jun 2022 12:47:16 +0530
Subject: gradle: update AndroidX and Kotlin

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 build.gradle    | 8 ++++----
 settings.gradle | 2 +-
 ui/build.gradle | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8615fb43..e1912e4d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,20 +2,20 @@ buildscript {
     ext {
         activityVersion = '1.4.0'
         annotationsVersion = '1.3.0'
-        appcompatVersion = '1.4.1'
+        appcompatVersion = '1.4.2'
         biometricVersion = '1.1.0'
         collectionVersion = '1.2.0'
         constraintLayoutVersion = '2.1.4'
         coordinatorLayoutVersion = '1.2.0'
-        coreKtxVersion = '1.7.0'
-        coroutinesVersion = '1.6.1'
+        coreKtxVersion = '1.8.0'
+        coroutinesVersion = '1.6.2'
         datastoreVersion = '1.0.0'
         desugarVersion = '1.1.5'
         fragmentVersion = '1.4.1'
         jsr305Version = '3.0.2'
         junitVersion = '4.13.2'
         lifecycleRuntimeKtxVersion = '2.4.1'
-        materialComponentsVersion = '1.6.0'
+        materialComponentsVersion = '1.6.1'
         preferenceVersion = '1.2.0'
         zxingEmbeddedVersion = '4.3.0'
 
diff --git a/settings.gradle b/settings.gradle
index 9430d416..b2bc36a0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
 pluginManagement {
     def agpVersion = "7.2.1"
-    def kotlinVersion = "1.6.21"
+    def kotlinVersion = "1.7.0"
     repositories {
         gradlePluginPortal()
         google()
diff --git a/ui/build.gradle b/ui/build.gradle
index 2bbbe539..b48f0121 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -90,6 +90,5 @@ tasks.withType(JavaCompile) {
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8
-        useIR = true
     }
 }
-- 
cgit v1.2.3


From c3693b3e665d4a58d4d775441f4b7ea3de0b4404 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Wed, 15 Jun 2022 12:49:12 +0530
Subject: gradle: remove crowdin kludge

This never ended up being used over the shell script

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 build.gradle | 33 ---------------------------------
 1 file changed, 33 deletions(-)

diff --git a/build.gradle b/build.gradle
index e1912e4d..4aa755ab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,39 +23,6 @@ buildscript {
     }
 }
 
-plugins {
-    id "de.undercouch.download" version "5.0.4"
-}
-
-task downloadCrowdin(type: Download) {
-	src 'https://crowdin.com/backend/download/project/wireguard.zip'
-	dest file('build/translations.zip')
-	overwrite true
-}
-
-task cleanCrowdin(type: Delete) {
-	delete 'ui/src/main/res/values-*/strings.xml'
-}
-
-task extractCrowdin(type: Copy, dependsOn: ['downloadCrowdin', 'cleanCrowdin']) {
-	mustRunAfter 'downloadCrowdin'
-	from zipTree(file('build/translations.zip'))
-	into file('build/translations')
-	doFirst {
-		delete 'build/translations'
-	}
-}
-
-task crowdin(type: Copy, dependsOn: ['extractCrowdin']) {
-    mustRunAfter 'extractCrowdin'
-    from 'build/translations/wireguard-android/ui/src/main/res'
-    into 'ui/src/main/res/'
-    doLast {
-        delete 'build/translations'
-        delete 'build/translations.zip'
-    }
-}
-
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
-- 
cgit v1.2.3


From 284ad03ebffe41006a7a33ede0199a4d4f53abdf Mon Sep 17 00:00:00 2001
From: SlipkHunter <abrito025@gmail.com>
Date: Tue, 28 Jun 2022 12:58:55 -0300
Subject: ui: add barrier to fix detail fragment overlap

When listen port and MTU are hidden, we need a barrier here.

Signed-off-by: SlipkHunter <abrito025@gmail.com>
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 ui/src/main/res/layout/tunnel_detail_fragment.xml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/ui/src/main/res/layout/tunnel_detail_fragment.xml b/ui/src/main/res/layout/tunnel_detail_fragment.xml
index 7a962509..164fabf0 100644
--- a/ui/src/main/res/layout/tunnel_detail_fragment.xml
+++ b/ui/src/main/res/layout/tunnel_detail_fragment.xml
@@ -221,7 +221,6 @@
                         style="@style/DetailText"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginBottom="8dp"
                         android:contentDescription="@string/listen_port"
                         android:nextFocusRight="@id/mtu_text"
                         android:nextFocusUp="@id/dns_search_domains_text"
@@ -230,7 +229,6 @@
                         android:onClick="@{ClipboardUtils::copyTextView}"
                         android:text="@{config.interface.listenPort}"
                         android:visibility="@{!config.interface.listenPort.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}"
-                        app:layout_constraintBottom_toTopOf="@id/applications_label"
                         app:layout_constraintEnd_toStartOf="@id/mtu_label"
                         app:layout_constraintHorizontal_weight="0.5"
                         app:layout_constraintStart_toStartOf="parent"
@@ -256,7 +254,6 @@
                         style="@style/DetailText"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginBottom="8dp"
                         android:contentDescription="@string/mtu"
                         android:nextFocusLeft="@id/listen_port_text"
                         android:nextFocusUp="@id/dns_servers_text"
@@ -264,7 +261,6 @@
                         android:onClick="@{ClipboardUtils::copyTextView}"
                         android:text="@{config.interface.mtu}"
                         android:visibility="@{!config.interface.mtu.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}"
-                        app:layout_constraintBottom_toTopOf="@id/applications_label"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintHorizontal_weight="0.5"
                         app:layout_constraintStart_toEndOf="@id/listen_port_label"
@@ -272,6 +268,13 @@
                         app:layout_constraintTop_toBottomOf="@+id/mtu_label"
                         tools:text="1500" />
 
+                    <androidx.constraintlayout.widget.Barrier
+                        android:id="@+id/listen_port_mtu_barrier"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        app:barrierDirection="bottom"
+                        app:constraint_referenced_ids="listen_port_text,mtu_text" />
+
                     <TextView
                         android:id="@+id/applications_label"
                         android:layout_width="match_parent"
@@ -280,7 +283,7 @@
                         android:labelFor="@+id/applications_text"
                         android:text="@string/applications"
                         android:visibility="@{config.interface.includedApplications.isEmpty() &amp;&amp; config.interface.excludedApplications.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
-                        app:layout_constraintBottom_toTopOf="@id/applications_text"
+                        app:layout_constraintTop_toBottomOf="@+id/listen_port_mtu_barrier"
                         app:layout_constraintStart_toStartOf="parent" />
 
                     <TextView
@@ -295,7 +298,7 @@
                         android:onClick="@{ClipboardUtils::copyTextView}"
                         android:text="@{config.interface.includedApplications.isEmpty() ? @plurals/n_excluded_applications(config.interface.excludedApplications.size(), config.interface.excludedApplications.size()) : @plurals/n_included_applications(config.interface.includedApplications.size(), config.interface.includedApplications.size())}"
                         android:visibility="@{config.interface.includedApplications.isEmpty() &amp;&amp; config.interface.excludedApplications.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
-                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/applications_label"
                         app:layout_constraintStart_toStartOf="parent"
                         tools:text="8 excluded" />
                 </androidx.constraintlayout.widget.ConstraintLayout>
@@ -315,4 +318,4 @@
                 tools:ignore="UselessLeaf" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
-</layout>
+</layout>
\ No newline at end of file
-- 
cgit v1.2.3


From 9f139134c23f91e96631c12e9d5e555afe655a28 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Thu, 4 Aug 2022 02:09:38 +0530
Subject: gradle: bump wrapper version

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 build.gradle                             |   4 ++--
 gradle/wrapper/gradle-wrapper.jar        | Bin 59821 -> 60756 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4aa755ab..027d7afe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,8 +29,8 @@ task clean(type: Delete) {
 
 tasks {
     wrapper {
-        gradleVersion = "7.4.2"
-        distributionSha256Sum = "29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda"
+        gradleVersion = "7.5"
+        distributionSha256Sum = "cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2"
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 41d9927a..249e5832 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5c51a4ac..012d6d90 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionSha256Sum=cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-- 
cgit v1.2.3


From 4ff564521fd42dcd54c8e0886317cae64d19d6f3 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Thu, 4 Aug 2022 02:12:27 +0530
Subject: gradle: upgrade plugins and runtime dependencies

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 build.gradle    | 10 +++++-----
 settings.gradle |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 027d7afe..1cc26780 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,20 +1,20 @@
 buildscript {
     ext {
-        activityVersion = '1.4.0'
-        annotationsVersion = '1.3.0'
+        activityVersion = '1.5.1'
+        annotationsVersion = '1.4.0'
         appcompatVersion = '1.4.2'
         biometricVersion = '1.1.0'
         collectionVersion = '1.2.0'
         constraintLayoutVersion = '2.1.4'
         coordinatorLayoutVersion = '1.2.0'
         coreKtxVersion = '1.8.0'
-        coroutinesVersion = '1.6.2'
+        coroutinesVersion = '1.6.4'
         datastoreVersion = '1.0.0'
         desugarVersion = '1.1.5'
-        fragmentVersion = '1.4.1'
+        fragmentVersion = '1.5.1'
         jsr305Version = '3.0.2'
         junitVersion = '4.13.2'
-        lifecycleRuntimeKtxVersion = '2.4.1'
+        lifecycleRuntimeKtxVersion = '2.5.1'
         materialComponentsVersion = '1.6.1'
         preferenceVersion = '1.2.0'
         zxingEmbeddedVersion = '4.3.0'
diff --git a/settings.gradle b/settings.gradle
index b2bc36a0..e61ef5a0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
 pluginManagement {
-    def agpVersion = "7.2.1"
-    def kotlinVersion = "1.7.0"
+    def agpVersion = "7.2.2"
+    def kotlinVersion = "1.7.10"
     repositories {
         gradlePluginPortal()
         google()
-- 
cgit v1.2.3


From 0459d6d9f4d9a8e22121e4b8ee010fda88209467 Mon Sep 17 00:00:00 2001
From: Hwanseung Lee <hwanseung@chromium.org>
Date: Thu, 1 Dec 2022 02:25:07 +0900
Subject: ui: un-export VpnService

There is no reason to expose this service to external apps.[1]

[1] https://developer.android.com/guide/topics/manifest/activity-element#exported

Signed-off-by: Hwanseung Lee <hwanseung@chromium.org>
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 tunnel/src/main/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tunnel/src/main/AndroidManifest.xml b/tunnel/src/main/AndroidManifest.xml
index dc0d6c7f..9db194f8 100644
--- a/tunnel/src/main/AndroidManifest.xml
+++ b/tunnel/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
         <service
             android:name="com.wireguard.android.backend.GoBackend$VpnService"
             android:permission="android.permission.BIND_VPN_SERVICE"
-            android:exported="true">
+            android:exported="false">
             <intent-filter>
                 <action android:name="android.net.VpnService" />
             </intent-filter>
-- 
cgit v1.2.3


From 98fe4438d572a132d74fd17aeb040a8d4cf3f36d Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Thu, 1 Dec 2022 00:14:36 +0530
Subject: gradle: bump wrapper version

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 build.gradle                             |  4 ++--
 gradle/wrapper/gradle-wrapper.properties |  5 +++--
 gradlew                                  | 18 ++++++++++++++----
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1cc26780..dda8b919 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,8 +29,8 @@ task clean(type: Delete) {
 
 tasks {
     wrapper {
-        gradleVersion = "7.5"
-        distributionSha256Sum = "cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2"
+        gradleVersion = "7.6"
+        distributionSha256Sum = "7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b"
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 012d6d90..adb6acbd 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1b6c7873..65dcd68d 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-- 
cgit v1.2.3


From f269fb175dd7bdf5e2fa785ed451c2c81a529400 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Thu, 1 Dec 2022 00:14:51 +0530
Subject: gradle: update AndroidX and Kotlin

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 build.gradle    | 12 ++++++------
 settings.gradle |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index dda8b919..4fe2dcda 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,21 +1,21 @@
 buildscript {
     ext {
-        activityVersion = '1.5.1'
-        annotationsVersion = '1.4.0'
-        appcompatVersion = '1.4.2'
+        activityVersion = '1.6.1'
+        annotationsVersion = '1.5.0'
+        appcompatVersion = '1.5.1'
         biometricVersion = '1.1.0'
         collectionVersion = '1.2.0'
         constraintLayoutVersion = '2.1.4'
         coordinatorLayoutVersion = '1.2.0'
-        coreKtxVersion = '1.8.0'
+        coreKtxVersion = '1.9.0'
         coroutinesVersion = '1.6.4'
         datastoreVersion = '1.0.0'
         desugarVersion = '1.1.5'
-        fragmentVersion = '1.5.1'
+        fragmentVersion = '1.5.4'
         jsr305Version = '3.0.2'
         junitVersion = '4.13.2'
         lifecycleRuntimeKtxVersion = '2.5.1'
-        materialComponentsVersion = '1.6.1'
+        materialComponentsVersion = '1.7.0'
         preferenceVersion = '1.2.0'
         zxingEmbeddedVersion = '4.3.0'
 
diff --git a/settings.gradle b/settings.gradle
index e61ef5a0..84f80b40 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
 pluginManagement {
-    def agpVersion = "7.2.2"
-    def kotlinVersion = "1.7.10"
+    def agpVersion = "7.3.1"
+    def kotlinVersion = "1.7.22"
     repositories {
         gradlePluginPortal()
         google()
-- 
cgit v1.2.3


From b353ed8ae92dd7f852bde4096e009822cb78d97f Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Fri, 20 Jan 2023 11:43:50 +0530
Subject: gradle: update AGP and Kotlin

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 settings.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index 84f80b40..2a030305 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
 pluginManagement {
-    def agpVersion = "7.3.1"
-    def kotlinVersion = "1.7.22"
+    def agpVersion = "7.4.0"
+    def kotlinVersion = "1.8.0"
     repositories {
         gradlePluginPortal()
         google()
-- 
cgit v1.2.3


From 4f26156030a24d8ce3107104636f4ee85d8065f6 Mon Sep 17 00:00:00 2001
From: SlipkHunter <abrito025@gmail.com>
Date: Thu, 19 Jan 2023 20:44:41 -0300
Subject: gradle: force the use of an older NDK version

NDK 25.x removed the bundled ld.gold/ld.bfd linkers, replacing
them with the ld.ldd linker from LLVM. This causes the toolchains
to pick up the host OS' `ld.gold` instead, which does not
know how to link ARM(64) code and fails the build.

Fixes: f269fb175dd7 ("gradle: update AndroidX and Kotlin")
Signed-off-by: SlipkHunter <abrito025@gmail.com>
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 tunnel/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tunnel/build.gradle b/tunnel/build.gradle
index ff1aad19..9b894735 100644
--- a/tunnel/build.gradle
+++ b/tunnel/build.gradle
@@ -7,6 +7,7 @@ group groupName
 
 android {
     compileSdkVersion 31
+    ndkVersion '21.4.7075529'
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
-- 
cgit v1.2.3


From f8690ca21511fe9a916911b0d799388ea29c911b Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Fri, 20 Jan 2023 19:05:10 +0530
Subject: gradle: migrate to namespace attribute

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 tunnel/build.gradle                 | 1 +
 tunnel/src/main/AndroidManifest.xml | 3 +--
 ui/build.gradle                     | 1 +
 ui/src/main/AndroidManifest.xml     | 1 -
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tunnel/build.gradle b/tunnel/build.gradle
index 9b894735..e70f7eb6 100644
--- a/tunnel/build.gradle
+++ b/tunnel/build.gradle
@@ -12,6 +12,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'com.wireguard.android.tunnel'
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 31
diff --git a/tunnel/src/main/AndroidManifest.xml b/tunnel/src/main/AndroidManifest.xml
index 9db194f8..0d97f321 100644
--- a/tunnel/src/main/AndroidManifest.xml
+++ b/tunnel/src/main/AndroidManifest.xml
@@ -3,8 +3,7 @@
   ~ SPDX-License-Identifier: Apache-2.0
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.wireguard.android.tunnel">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <service
diff --git a/ui/build.gradle b/ui/build.gradle
index b48f0121..538b3d0c 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -18,6 +18,7 @@ android {
         dataBinding = true
         viewBinding = true
     }
+    namespace = 'com.wireguard.android'
     defaultConfig {
         applicationId 'com.wireguard.android'
         minSdkVersion 21
diff --git a/ui/src/main/AndroidManifest.xml b/ui/src/main/AndroidManifest.xml
index 4dd38cb2..3993e1ff 100644
--- a/ui/src/main/AndroidManifest.xml
+++ b/ui/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.wireguard.android"
     android:installLocation="internalOnly">
 
     <uses-permission android:name="android.permission.CAMERA" />
-- 
cgit v1.2.3


From 713947e432126e0e29dcf497960e5fa0f6301e2b Mon Sep 17 00:00:00 2001
From: SlipkHunter <abrito025@gmail.com>
Date: Thu, 19 Jan 2023 20:34:47 -0300
Subject: gradle: adjust for and raise compileSdk to 33

Signed-off-by: SlipkHunter <abrito025@gmail.com>
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 tunnel/build.gradle             |  2 +-
 ui/build.gradle                 |  2 +-
 ui/src/main/AndroidManifest.xml | 19 +++++++++++++------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/tunnel/build.gradle b/tunnel/build.gradle
index e70f7eb6..e1742f4c 100644
--- a/tunnel/build.gradle
+++ b/tunnel/build.gradle
@@ -6,7 +6,7 @@ version wireguardVersionName
 group groupName
 
 android {
-    compileSdkVersion 31
+    compileSdk 33
     ndkVersion '21.4.7075529'
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/ui/build.gradle b/ui/build.gradle
index 538b3d0c..e95d1779 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -12,7 +12,7 @@ group groupName
 final def keystorePropertiesFile = rootProject.file("keystore.properties")
 
 android {
-    compileSdkVersion 31
+    compileSdk 33
     buildFeatures {
         buildConfig = true
         dataBinding = true
diff --git a/ui/src/main/AndroidManifest.xml b/ui/src/main/AndroidManifest.xml
index 3993e1ff..f1daac30 100644
--- a/ui/src/main/AndroidManifest.xml
+++ b/ui/src/main/AndroidManifest.xml
@@ -20,6 +20,9 @@
     <uses-feature
         android:name="android.hardware.camera.any"
         android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
 
     <permission
         android:name="${applicationId}.permission.CONTROL_TUNNELS"
@@ -43,7 +46,7 @@
             android:theme="@style/NoBackgroundTheme"
             android:excludeFromRecents="true"/>
 
-        <activity android:name=".activity.MainActivity">
+        <activity android:name=".activity.MainActivity" android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -57,7 +60,8 @@
 
         <activity
             android:name=".activity.TvMainActivity"
-            android:theme="@style/TvTheme">
+            android:theme="@style/TvTheme"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
@@ -81,7 +85,8 @@
 
         <activity
             android:name=".activity.LogViewerActivity"
-            android:label="@string/log_viewer_title">
+            android:label="@string/log_viewer_title"
+            android:exported="false">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -93,7 +98,7 @@
             android:exported="false"
             android:grantUriPermissions="true" />
 
-        <receiver android:name=".BootShutdownReceiver">
+        <receiver android:name=".BootShutdownReceiver" android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.ACTION_SHUTDOWN" />
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -102,7 +107,8 @@
 
         <receiver
             android:name=".model.TunnelManager$IntentReceiver"
-            android:permission="${applicationId}.permission.CONTROL_TUNNELS">
+            android:permission="${applicationId}.permission.CONTROL_TUNNELS"
+            android:exported="true">
             <intent-filter>
                 <action android:name="com.wireguard.android.action.REFRESH_TUNNEL_STATES" />
                 <action android:name="com.wireguard.android.action.SET_TUNNEL_UP" />
@@ -113,7 +119,8 @@
         <service
             android:name=".QuickTileService"
             android:icon="@drawable/ic_tile"
-            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            android:exported="true">
 
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
-- 
cgit v1.2.3


From 560d9cf967d7d453914b36d6d8b17d2658f3720d Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Tue, 21 Mar 2023 15:22:43 +0100
Subject: tools: bump deps

Notably, this isn't bumping to the latest wireguard-go master, which is
still in flux.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 tunnel/tools/libwg-go/Makefile                     |  8 +--
 tunnel/tools/libwg-go/go.mod                       | 12 ++--
 tunnel/tools/libwg-go/go.sum                       | 20 +++----
 .../goruntime-boottime-over-monotonic.diff         | 67 +++++++++++-----------
 tunnel/tools/wireguard-tools                       |  2 +-
 5 files changed, 55 insertions(+), 54 deletions(-)

diff --git a/tunnel/tools/libwg-go/Makefile b/tunnel/tools/libwg-go/Makefile
index a2aefef7..058f456b 100644
--- a/tunnel/tools/libwg-go/Makefile
+++ b/tunnel/tools/libwg-go/Makefile
@@ -20,12 +20,12 @@ export GOARCH := $(NDK_GO_ARCH_MAP_$(ANDROID_ARCH_NAME))
 export GOOS := android
 export CGO_ENABLED := 1
 
-GO_VERSION := 1.18.2
+GO_VERSION := 1.20.2
 GO_PLATFORM := $(shell uname -s | tr '[:upper:]' '[:lower:]')-$(NDK_GO_ARCH_MAP_$(shell uname -m))
 GO_TARBALL := go$(GO_VERSION).$(GO_PLATFORM).tar.gz
-GO_HASH_darwin-amd64 := 1f5f539ce0baa8b65f196ee219abf73a7d9cf558ba9128cc0fe4833da18b04f2
-GO_HASH_darwin-arm64 := 6c7df9a2405f09aa9bab55c93c9c4ce41d3e58127d626bc1825ba5d0a0045d5c
-GO_HASH_linux-amd64 := e54bec97a1a5d230fc2f9ad0880fcbabb5888f30ed9666eca4a91c5a32e86cbc
+GO_HASH_darwin-amd64 := c93b8ced9517d07e1cd4c362c6e2d5242cb139e29b417a328fbf19aded08764c
+GO_HASH_darwin-arm64 := 7343c87f19e79c0063532e82e1c4d6f42175a32d99f7a4d15e658e88bf97f885
+GO_HASH_linux-amd64 := 4eaea32f59cde4dc635fbc42161031d13e1c780b87097f4b4234cfce671f1768
 
 default: $(DESTDIR)/libwg-go.so
 
diff --git a/tunnel/tools/libwg-go/go.mod b/tunnel/tools/libwg-go/go.mod
index e64d2fb1..9318ebcf 100644
--- a/tunnel/tools/libwg-go/go.mod
+++ b/tunnel/tools/libwg-go/go.mod
@@ -1,14 +1,14 @@
 module golang.zx2c4.com/wireguard/android
 
-go 1.18
+go 1.20
 
 require (
-	golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a
-	golang.zx2c4.com/wireguard v0.0.0-20220407013110-ef5c587f782d
+	golang.org/x/sys v0.6.0
+	golang.zx2c4.com/wireguard v0.0.0-20230223181233-21636207a675
 )
 
 require (
-	golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8 // indirect
-	golang.org/x/net v0.0.0-20220516155154-20f960328961 // indirect
-	golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224 // indirect
+	golang.org/x/crypto v0.7.0 // indirect
+	golang.org/x/net v0.8.0 // indirect
+	golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
 )
diff --git a/tunnel/tools/libwg-go/go.sum b/tunnel/tools/libwg-go/go.sum
index 633bbf7a..3b49b497 100644
--- a/tunnel/tools/libwg-go/go.sum
+++ b/tunnel/tools/libwg-go/go.sum
@@ -1,10 +1,10 @@
-golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8 h1:y+mHpWoQJNAHt26Nhh6JP7hvM71IRZureyvZhoVALIs=
-golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/net v0.0.0-20220516155154-20f960328961 h1:+W/iTMPG0EL7aW+/atntZwZrvSRIj3m3yX414dSULUU=
-golang.org/x/net v0.0.0-20220516155154-20f960328961/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a h1:N2T1jUrTQE9Re6TFF5PhvEHXHCguynGhKjWVsIUt5cY=
-golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224 h1:Ug9qvr1myri/zFN6xL17LSCBGFDnphBBhzmILHsM5TY=
-golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI=
-golang.zx2c4.com/wireguard v0.0.0-20220407013110-ef5c587f782d h1:q4JksJ2n0fmbXC0Aj0eOs6E0AcPqnKglxWXWFqGD6x0=
-golang.zx2c4.com/wireguard v0.0.0-20220407013110-ef5c587f782d/go.mod h1:bVQfyl2sCM/QIIGHpWbFGfHPuDvqnCNkT6MQLTCjO/U=
+golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
+golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
+golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
+golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
+golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+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-20230223181233-21636207a675 h1:/J/RVnr7ng4fWPRH3xa4WtBJ1Jp+Auu4YNLmGiPv5QU=
+golang.zx2c4.com/wireguard v0.0.0-20230223181233-21636207a675/go.mod h1:whfbyDBt09xhCYQWtO2+3UVjlaq6/9hDZrjg2ZE6SyA=
diff --git a/tunnel/tools/libwg-go/goruntime-boottime-over-monotonic.diff b/tunnel/tools/libwg-go/goruntime-boottime-over-monotonic.diff
index 5cbc2256..7ae0999e 100644
--- a/tunnel/tools/libwg-go/goruntime-boottime-over-monotonic.diff
+++ b/tunnel/tools/libwg-go/goruntime-boottime-over-monotonic.diff
@@ -1,7 +1,8 @@
-From b83553d9f260ba20c6faaa52e6fe6f74309eb41a Mon Sep 17 00:00:00 2001
+From 729c58cb1c0496497dac6de3d0bf540f6149618f Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
-Date: Mon, 22 Feb 2021 02:36:03 +0100
-Subject: [PATCH] runtime: use CLOCK_BOOTTIME in nanotime on Linux
+Date: Tue, 21 Mar 2023 15:33:56 +0100
+Subject: [PATCH] [release-branch.go1.20] runtime: use CLOCK_BOOTTIME in
+ nanotime on Linux
 
 This makes timers account for having expired while a computer was
 asleep, which is quite common on mobile devices. Note that BOOTTIME is
@@ -28,10 +29,10 @@ Change-Id: I7b2a6ca0c5bc5fce57ec0eeafe7b68270b429321
  8 files changed, 11 insertions(+), 11 deletions(-)
 
 diff --git a/src/runtime/sys_linux_386.s b/src/runtime/sys_linux_386.s
-index 1e3a834812..78b6021fc7 100644
+index 12a294153d..17e3524b40 100644
 --- a/src/runtime/sys_linux_386.s
 +++ b/src/runtime/sys_linux_386.s
-@@ -337,13 +337,13 @@ noswitch:
+@@ -352,13 +352,13 @@ noswitch:
  
  	LEAL	8(SP), BX	// &ts (struct timespec)
  	MOVL	BX, 4(SP)
@@ -48,10 +49,10 @@ index 1e3a834812..78b6021fc7 100644
  	INVOKE_SYSCALL
  
 diff --git a/src/runtime/sys_linux_amd64.s b/src/runtime/sys_linux_amd64.s
-index 37cb8dad03..e8b730bcaa 100644
+index c7a89ba536..01f0a6a26e 100644
 --- a/src/runtime/sys_linux_amd64.s
 +++ b/src/runtime/sys_linux_amd64.s
-@@ -302,7 +302,7 @@ noswitch:
+@@ -255,7 +255,7 @@ noswitch:
  	SUBQ	$16, SP		// Space for results
  	ANDQ	$~15, SP	// Align for C code
  
@@ -61,7 +62,7 @@ index 37cb8dad03..e8b730bcaa 100644
  	MOVQ	runtime·vdsoClockgettimeSym(SB), AX
  	CMPQ	AX, $0
 diff --git a/src/runtime/sys_linux_arm.s b/src/runtime/sys_linux_arm.s
-index 475f52344c..bb567abcf4 100644
+index 7b8c4f0e04..9798a1334e 100644
 --- a/src/runtime/sys_linux_arm.s
 +++ b/src/runtime/sys_linux_arm.s
 @@ -11,7 +11,7 @@
@@ -73,20 +74,20 @@ index 475f52344c..bb567abcf4 100644
  
  // for EABI, as we don't support OABI
  #define SYS_BASE 0x0
-@@ -366,7 +366,7 @@ noswitch:
- 	SUB	$24, R13	// Space for results
- 	BIC	$0x7, R13	// Align for C code
+@@ -374,7 +374,7 @@ finish:
  
+ // func nanotime1() int64
+ TEXT runtime·nanotime1(SB),NOSPLIT,$12-8
 -	MOVW	$CLOCK_MONOTONIC, R0
 +	MOVW	$CLOCK_BOOTTIME, R0
- 	MOVW	$8(R13), R1	// timespec
- 	MOVW	runtime·vdsoClockgettimeSym(SB), R2
- 	CMP	$0, R2
+ 	MOVW	$spec-12(SP), R1	// timespec
+ 
+ 	MOVW	runtime·vdsoClockgettimeSym(SB), R4
 diff --git a/src/runtime/sys_linux_arm64.s b/src/runtime/sys_linux_arm64.s
-index 198a5bacef..9715387f36 100644
+index 38ff6ac330..6b819c5441 100644
 --- a/src/runtime/sys_linux_arm64.s
 +++ b/src/runtime/sys_linux_arm64.s
-@@ -13,7 +13,7 @@
+@@ -14,7 +14,7 @@
  #define AT_FDCWD -100
  
  #define CLOCK_REALTIME 0
@@ -95,7 +96,7 @@ index 198a5bacef..9715387f36 100644
  
  #define SYS_exit		93
  #define SYS_read		63
-@@ -319,7 +319,7 @@ noswitch:
+@@ -338,7 +338,7 @@ noswitch:
  	BIC	$15, R1
  	MOVD	R1, RSP
  
@@ -105,10 +106,10 @@ index 198a5bacef..9715387f36 100644
  	CBZ	R2, fallback
  
 diff --git a/src/runtime/sys_linux_mips64x.s b/src/runtime/sys_linux_mips64x.s
-index c3e9f37694..e3879acd38 100644
+index 47f2da524d..6c1a9a2801 100644
 --- a/src/runtime/sys_linux_mips64x.s
 +++ b/src/runtime/sys_linux_mips64x.s
-@@ -312,7 +312,7 @@ noswitch:
+@@ -326,7 +326,7 @@ noswitch:
  	AND	$~15, R1	// Align for C code
  	MOVV	R1, R29
  
@@ -118,10 +119,10 @@ index c3e9f37694..e3879acd38 100644
  
  	MOVV	runtime·vdsoClockgettimeSym(SB), R25
 diff --git a/src/runtime/sys_linux_mipsx.s b/src/runtime/sys_linux_mipsx.s
-index fab2ab3892..f9af103594 100644
+index 5e6b6c1504..7f5fd2a80e 100644
 --- a/src/runtime/sys_linux_mipsx.s
 +++ b/src/runtime/sys_linux_mipsx.s
-@@ -238,7 +238,7 @@ TEXT runtime·walltime1(SB),NOSPLIT,$8-12
+@@ -243,7 +243,7 @@ TEXT runtime·walltime(SB),NOSPLIT,$8-12
  	RET
  
  TEXT runtime·nanotime1(SB),NOSPLIT,$8-8
@@ -131,11 +132,11 @@ index fab2ab3892..f9af103594 100644
  	MOVW	$SYS_clock_gettime, R2
  	SYSCALL
 diff --git a/src/runtime/sys_linux_ppc64x.s b/src/runtime/sys_linux_ppc64x.s
-index fd69ee70a5..ff6bc8355b 100644
+index d0427a4807..05ee9fede9 100644
 --- a/src/runtime/sys_linux_ppc64x.s
 +++ b/src/runtime/sys_linux_ppc64x.s
-@@ -249,7 +249,7 @@ fallback:
- 	JMP	finish
+@@ -298,7 +298,7 @@ fallback:
+ 	JMP	return
  
  TEXT runtime·nanotime1(SB),NOSPLIT,$16-8
 -	MOVD	$1, R3		// CLOCK_MONOTONIC
@@ -144,18 +145,18 @@ index fd69ee70a5..ff6bc8355b 100644
  	MOVD	R1, R15		// R15 is unchanged by C code
  	MOVD	g_m(g), R21	// R21 = m
 diff --git a/src/runtime/sys_linux_s390x.s b/src/runtime/sys_linux_s390x.s
-index c15a1d5364..f52c4d5098 100644
+index 1448670b91..7d2ee3231c 100644
 --- a/src/runtime/sys_linux_s390x.s
 +++ b/src/runtime/sys_linux_s390x.s
-@@ -207,7 +207,7 @@ TEXT runtime·walltime1(SB),NOSPLIT,$16
+@@ -296,7 +296,7 @@ fallback:
  	RET
  
- TEXT runtime·nanotime1(SB),NOSPLIT,$16
--	MOVW	$1, R2 // CLOCK_MONOTONIC
-+	MOVW	$7, R2 // CLOCK_BOOTTIME
- 	MOVD	$tp-16(SP), R3
- 	MOVW	$SYS_clock_gettime, R1
- 	SYSCALL
+ TEXT runtime·nanotime1(SB),NOSPLIT,$32-8
+-	MOVW	$1, R2			// CLOCK_MONOTONIC
++	MOVW	$7, R2			// CLOCK_BOOTTIME
+ 
+ 	MOVD	R15, R7			// Backup stack pointer
+ 
 -- 
-2.30.1
+2.40.0
 
diff --git a/tunnel/tools/wireguard-tools b/tunnel/tools/wireguard-tools
index c0b68d2e..b4f6b4f2 160000
--- a/tunnel/tools/wireguard-tools
+++ b/tunnel/tools/wireguard-tools
@@ -1 +1 @@
-Subproject commit c0b68d2eafaf2b44df9377ba0844bc315163247e
+Subproject commit b4f6b4f229d291daf7c35c6f1e7f4841cc6d69bc
-- 
cgit v1.2.3


From a386e3a3d294ef7994a0b216ea867572581230e9 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Tue, 21 Mar 2023 15:30:38 +0100
Subject: build: update to gradle 7.4.2 and restructure lint block

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 settings.gradle     | 2 +-
 tunnel/build.gradle | 5 ++---
 ui/build.gradle     | 7 +++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index 2a030305..e6dd51a5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,5 @@
 pluginManagement {
-    def agpVersion = "7.4.0"
+    def agpVersion = '7.4.2'
     def kotlinVersion = "1.8.0"
     repositories {
         gradlePluginPortal()
diff --git a/tunnel/build.gradle b/tunnel/build.gradle
index e1742f4c..da15770b 100644
--- a/tunnel/build.gradle
+++ b/tunnel/build.gradle
@@ -45,9 +45,8 @@ android {
             }
         }
     }
-    lintOptions {
-        disable('LongLogTag')
-        disable('NewApi') // Desugaring!
+    lint {
+        disable 'LongLogTag', 'NewApi'
     }
 }
 
diff --git a/ui/build.gradle b/ui/build.gradle
index e95d1779..94bbf786 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -56,10 +56,9 @@ android {
             versionNameSuffix "-debug"
         }
     }
-    lintOptions {
-        disable('LongLogTag')
-        warning('MissingTranslation')
-        warning('ImpliedQuantity')
+    lint {
+        disable 'LongLogTag'
+        warning 'MissingTranslation', 'ImpliedQuantity'
     }
 }
 
-- 
cgit v1.2.3


From 853e86e6d057e2a50317405c594296ca8aa32df3 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Tue, 21 Mar 2023 15:41:11 +0100
Subject: global: bump copyright date

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 tunnel/src/main/AndroidManifest.xml                                     | 2 +-
 tunnel/src/main/java/com/wireguard/android/backend/Backend.java         | 2 +-
 .../src/main/java/com/wireguard/android/backend/BackendException.java   | 2 +-
 tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java       | 2 +-
 tunnel/src/main/java/com/wireguard/android/backend/Statistics.java      | 2 +-
 tunnel/src/main/java/com/wireguard/android/backend/Tunnel.java          | 2 +-
 tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java  | 2 +-
 tunnel/src/main/java/com/wireguard/android/util/RootShell.java          | 2 +-
 .../src/main/java/com/wireguard/android/util/SharedLibraryLoader.java   | 2 +-
 tunnel/src/main/java/com/wireguard/android/util/ToolsInstaller.java     | 2 +-
 tunnel/src/main/java/com/wireguard/config/Attribute.java                | 2 +-
 tunnel/src/main/java/com/wireguard/config/BadConfigException.java       | 2 +-
 tunnel/src/main/java/com/wireguard/config/Config.java                   | 2 +-
 tunnel/src/main/java/com/wireguard/config/InetAddresses.java            | 2 +-
 tunnel/src/main/java/com/wireguard/config/InetEndpoint.java             | 2 +-
 tunnel/src/main/java/com/wireguard/config/InetNetwork.java              | 2 +-
 tunnel/src/main/java/com/wireguard/config/Interface.java                | 2 +-
 tunnel/src/main/java/com/wireguard/config/ParseException.java           | 2 +-
 tunnel/src/main/java/com/wireguard/config/Peer.java                     | 2 +-
 tunnel/src/main/java/com/wireguard/crypto/Curve25519.java               | 2 +-
 tunnel/src/main/java/com/wireguard/crypto/Key.java                      | 2 +-
 tunnel/src/main/java/com/wireguard/crypto/KeyFormatException.java       | 2 +-
 tunnel/src/main/java/com/wireguard/crypto/KeyPair.java                  | 2 +-
 tunnel/src/main/java/com/wireguard/util/NonNullForAll.java              | 2 +-
 tunnel/src/test/java/com/wireguard/config/BadConfigExceptionTest.java   | 2 +-
 tunnel/src/test/java/com/wireguard/config/ConfigTest.java               | 2 +-
 tunnel/tools/CMakeLists.txt                                             | 2 +-
 tunnel/tools/libwg-go/Makefile                                          | 2 +-
 tunnel/tools/ndk-compat/compat.c                                        | 2 +-
 tunnel/tools/ndk-compat/compat.h                                        | 2 +-
 ui/src/main/java/com/wireguard/android/Application.kt                   | 2 +-
 ui/src/main/java/com/wireguard/android/BootShutdownReceiver.kt          | 2 +-
 ui/src/main/java/com/wireguard/android/QuickTileService.kt              | 2 +-
 ui/src/main/java/com/wireguard/android/activity/BaseActivity.kt         | 2 +-
 ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt    | 2 +-
 ui/src/main/java/com/wireguard/android/activity/MainActivity.kt         | 2 +-
 ui/src/main/java/com/wireguard/android/activity/SettingsActivity.kt     | 2 +-
 .../java/com/wireguard/android/activity/ThemeChangeAwareActivity.kt     | 2 +-
 .../main/java/com/wireguard/android/activity/TunnelCreatorActivity.kt   | 2 +-
 ui/src/main/java/com/wireguard/android/activity/TunnelToggleActivity.kt | 2 +-
 ui/src/main/java/com/wireguard/android/activity/TvMainActivity.kt       | 2 +-
 ui/src/main/java/com/wireguard/android/configStore/ConfigStore.kt       | 2 +-
 ui/src/main/java/com/wireguard/android/configStore/FileConfigStore.kt   | 2 +-
 ui/src/main/java/com/wireguard/android/databinding/BindingAdapters.kt   | 2 +-
 .../main/java/com/wireguard/android/databinding/ItemChangeListener.kt   | 2 +-
 ui/src/main/java/com/wireguard/android/databinding/Keyed.kt             | 2 +-
 .../java/com/wireguard/android/databinding/ObservableKeyedArrayList.kt  | 2 +-
 .../wireguard/android/databinding/ObservableKeyedRecyclerViewAdapter.kt | 2 +-
 .../com/wireguard/android/databinding/ObservableSortedKeyedArrayList.kt | 2 +-
 ui/src/main/java/com/wireguard/android/fragment/AddTunnelsSheet.kt      | 2 +-
 .../main/java/com/wireguard/android/fragment/AppListDialogFragment.kt   | 2 +-
 ui/src/main/java/com/wireguard/android/fragment/BaseFragment.kt         | 2 +-
 .../java/com/wireguard/android/fragment/ConfigNamingDialogFragment.kt   | 2 +-
 ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.kt | 2 +-
 ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt | 2 +-
 ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt   | 2 +-
 ui/src/main/java/com/wireguard/android/model/ApplicationData.kt         | 2 +-
 ui/src/main/java/com/wireguard/android/model/ObservableTunnel.kt        | 2 +-
 ui/src/main/java/com/wireguard/android/model/TunnelComparator.kt        | 2 +-
 ui/src/main/java/com/wireguard/android/model/TunnelManager.kt           | 2 +-
 .../com/wireguard/android/preference/KernelModuleEnablerPreference.kt   | 2 +-
 .../com/wireguard/android/preference/PreferencesPreferenceDataStore.kt  | 2 +-
 .../java/com/wireguard/android/preference/ToolsInstallerPreference.kt   | 2 +-
 ui/src/main/java/com/wireguard/android/preference/VersionPreference.kt  | 2 +-
 .../main/java/com/wireguard/android/preference/ZipExporterPreference.kt | 2 +-
 ui/src/main/java/com/wireguard/android/util/AdminKnobs.kt               | 2 +-
 ui/src/main/java/com/wireguard/android/util/BiometricAuthenticator.kt   | 2 +-
 ui/src/main/java/com/wireguard/android/util/ClipboardUtils.kt           | 2 +-
 ui/src/main/java/com/wireguard/android/util/DownloadsFileSaver.kt       | 2 +-
 ui/src/main/java/com/wireguard/android/util/ErrorMessages.kt            | 2 +-
 ui/src/main/java/com/wireguard/android/util/Extensions.kt               | 2 +-
 ui/src/main/java/com/wireguard/android/util/QrCodeFromFileScanner.kt    | 2 +-
 ui/src/main/java/com/wireguard/android/util/QuantityFormatter.kt        | 2 +-
 ui/src/main/java/com/wireguard/android/util/TunnelImporter.kt           | 2 +-
 ui/src/main/java/com/wireguard/android/util/UserKnobs.kt                | 2 +-
 ui/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.kt         | 2 +-
 ui/src/main/java/com/wireguard/android/viewmodel/InterfaceProxy.kt      | 2 +-
 ui/src/main/java/com/wireguard/android/viewmodel/PeerProxy.kt           | 2 +-
 ui/src/main/java/com/wireguard/android/widget/KeyInputFilter.kt         | 2 +-
 .../java/com/wireguard/android/widget/MultiselectableRelativeLayout.kt  | 2 +-
 ui/src/main/java/com/wireguard/android/widget/NameInputFilter.kt        | 2 +-
 ui/src/main/java/com/wireguard/android/widget/SlashDrawable.kt          | 2 +-
 ui/src/main/java/com/wireguard/android/widget/ToggleSwitch.kt           | 2 +-
 ui/src/main/res/drawable/ic_arrow_back.xml                              | 2 +-
 ui/src/main/res/drawable/tv_logo_banner.xml                             | 2 +-
 ui/src/main/res/layout/log_viewer_activity.xml                          | 2 +-
 ui/src/main/res/layout/log_viewer_entry.xml                             | 2 +-
 ui/src/main/res/xml/app_restrictions.xml                                | 2 +-
 88 files changed, 88 insertions(+), 88 deletions(-)

diff --git a/tunnel/src/main/AndroidManifest.xml b/tunnel/src/main/AndroidManifest.xml
index 0d97f321..99509a20 100644
--- a/tunnel/src/main/AndroidManifest.xml
+++ b/tunnel/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+  ~ Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
   ~ SPDX-License-Identifier: Apache-2.0
   -->
 
diff --git a/tunnel/src/main/java/com/wireguard/android/backend/Backend.java b/tunnel/src/main/java/com/wireguard/android/backend/Backend.java
index 5aaad826..edf98b9e 100644
--- a/tunnel/src/main/java/com/wireguard/android/backend/Backend.java
+++ b/tunnel/src/main/java/com/wireguard/android/backend/Backend.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/tunnel/src/main/java/com/wireguard/android/backend/BackendException.java b/tunnel/src/main/java/com/wireguard/android/backend/BackendException.java
index cfa5ce0d..af966ec1 100644
--- a/tunnel/src/main/java/com/wireguard/android/backend/BackendException.java
+++ b/tunnel/src/main/java/com/wireguard/android/backend/BackendException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java b/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java
index 3d0886cf..ef06ebe7 100644
--- a/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java
+++ b/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/tunnel/src/main/java/com/wireguard/android/backend/Statistics.java b/tunnel/src/main/java/com/wireguard/android/backend/Statistics.java
index 5d658019..35a472bd 100644
--- a/tunnel/src/main/java/com/wireguard/android/backend/Statistics.java
+++ b/tunnel/src/main/java/com/wireguard/android/backend/Statistics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/tunnel/src/main/java/com/wireguard/android/backend/Tunnel.java b/tunnel/src/main/java/com/wireguard/android/backend/Tunnel.java
index 9564bbd1..766df443 100644
--- a/tunnel/src/main/java/com/wireguard/android/backend/Tunnel.java
+++ b/tunnel/src/main/java/com/wireguard/android/backend/Tunnel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java b/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
index 3121c996..143a3ab4 100644
--- a/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
+++ b/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/tunnel/src/main/java/com/wireguard/android/util/RootShell.java b/tunnel/src/main/java/com/wireguard/android/util/RootShell.java
index d9f02b34..e123733b 100644
--- a/tunnel/src/main/java/com/wireguard/android/util/RootShell.java
+++ b/tunnel/src/main/java/com/wireguard/android/util/RootShell.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/tunnel/src/main/java/com/wireguard/android/util/SharedLibraryLoader.java b/tunnel/src/main/java/com/wireguard/android/util/SharedLibraryLoader.java
index cf4fb584..15a00467 100644
--- a/tunnel/src/main/java/com/wireguard/android/util/SharedLibraryLoader.java
+++ b/tunnel/src/main/java/com/wireguard/android/util/SharedLibraryLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/tunnel/src/main/java/com/wireguard/android/util/ToolsInstaller.java b/tunnel/src/main/java/com/wireguard/android/util/ToolsInstaller.java
index 04a4a948..65d23eab 100644
--- a/tunnel/src/main/java/com/wireguard/android/util/ToolsInstaller.java
+++ b/tunnel/src/main/java/com/wireguard/android/util/ToolsInstaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/tunnel/src/main/java/com/wireguard/config/Attribute.java b/tunnel/src/main/java/com/wireguard/config/Attribute.java
index 969a6aa2..1b7bc368 100644
--- a/tunnel/src/main/java/com/wireguard/config/Attribute.java
+++ b/tunnel/src/main/java/com/wireguard/config/Attribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/tunnel/src/main/java/com/wireguard/config/BadConfigException.java b/tunnel/src/main/java/com/wireguard/config/BadConfigException.java
index 8766ce51..db022e14 100644
--- a/tunnel/src/main/java/com/wireguard/config/BadConfigException.java
+++ b/tunnel/src/main/java/com/wireguard/config/BadConfigException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/tunnel/src/main/java/com/wireguard/config/Config.java b/tunnel/src/main/java/com/wireguard/config/Config.java
index 807ebec8..ee9cebce 100644
--- a/tunnel/src/main/java/com/wireguard/config/Config.java
+++ b/tunnel/src/main/java/com/wireguard/config/Config.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/tunnel/src/main/java/com/wireguard/config/InetAddresses.java b/tunnel/src/main/java/com/wireguard/config/InetAddresses.java
index c1305e84..e4d697c5 100644
--- a/tunnel/src/main/java/com/wireguard/config/InetAddresses.java
+++ b/tunnel/src/main/java/com/wireguard/config/InetAddresses.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/tunnel/src/main/java/com/wireguard/config/InetEndpoint.java b/tunnel/src/main/java/com/wireguard/config/InetEndpoint.java
index 66855f11..d1db432b 100644
--- a/tunnel/src/main/java/com/wireguard/config/InetEndpoint.java
+++ b/tunnel/src/main/java/com/wireguard/config/InetEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/tunnel/src/main/java/com/wireguard/config/InetNetwork.java b/tunnel/src/main/java/com/wireguard/config/InetNetwork.java
index 8abf79aa..4a918044 100644
--- a/tunnel/src/main/java/com/wireguard/config/InetNetwork.java
+++ b/tunnel/src/main/java/com/wireguard/config/InetNetwork.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/tunnel/src/main/java/com/wireguard/config/Interface.java b/tunnel/src/main/java/com/wireguard/config/Interface.java
index 694f313a..bebca2e5 100644
--- a/tunnel/src/main/java/com/wireguard/config/Interface.java
+++ b/tunnel/src/main/java/com/wireguard/config/Interface.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/tunnel/src/main/java/com/wireguard/config/ParseException.java b/tunnel/src/main/java/com/wireguard/config/ParseException.java
index 8766d995..e72ef3d7 100644
--- a/tunnel/src/main/java/com/wireguard/config/ParseException.java
+++ b/tunnel/src/main/java/com/wireguard/config/ParseException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/tunnel/src/main/java/com/wireguard/config/Peer.java b/tunnel/src/main/java/com/wireguard/config/Peer.java
index 9b87b397..8a0fd763 100644
--- a/tunnel/src/main/java/com/wireguard/config/Peer.java
+++ b/tunnel/src/main/java/com/wireguard/config/Peer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/tunnel/src/main/java/com/wireguard/crypto/Curve25519.java b/tunnel/src/main/java/com/wireguard/crypto/Curve25519.java
index 3104345e..aa66d1ca 100644
--- a/tunnel/src/main/java/com/wireguard/crypto/Curve25519.java
+++ b/tunnel/src/main/java/com/wireguard/crypto/Curve25519.java
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2016 Southern Storm Software, Pty Ltd.
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/tunnel/src/main/java/com/wireguard/crypto/Key.java b/tunnel/src/main/java/com/wireguard/crypto/Key.java
index ab5e13e0..5fa93a46 100644
--- a/tunnel/src/main/java/com/wireguard/crypto/Key.java
+++ b/tunnel/src/main/java/com/wireguard/crypto/Key.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/tunnel/src/main/java/com/wireguard/crypto/KeyFormatException.java b/tunnel/src/main/java/com/wireguard/crypto/KeyFormatException.java
index dda6d31f..c64b3dc8 100644
--- a/tunnel/src/main/java/com/wireguard/crypto/KeyFormatException.java
+++ b/tunnel/src/main/java/com/wireguard/crypto/KeyFormatException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/tunnel/src/main/java/com/wireguard/crypto/KeyPair.java b/tunnel/src/main/java/com/wireguard/crypto/KeyPair.java
index 1c0f0795..7a564689 100644
--- a/tunnel/src/main/java/com/wireguard/crypto/KeyPair.java
+++ b/tunnel/src/main/java/com/wireguard/crypto/KeyPair.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/tunnel/src/main/java/com/wireguard/util/NonNullForAll.java b/tunnel/src/main/java/com/wireguard/util/NonNullForAll.java
index ed914a20..1c395621 100644
--- a/tunnel/src/main/java/com/wireguard/util/NonNullForAll.java
+++ b/tunnel/src/main/java/com/wireguard/util/NonNullForAll.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/tunnel/src/test/java/com/wireguard/config/BadConfigExceptionTest.java b/tunnel/src/test/java/com/wireguard/config/BadConfigExceptionTest.java
index ad5b4cf8..a24e049e 100644
--- a/tunnel/src/test/java/com/wireguard/config/BadConfigExceptionTest.java
+++ b/tunnel/src/test/java/com/wireguard/config/BadConfigExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/tunnel/src/test/java/com/wireguard/config/ConfigTest.java b/tunnel/src/test/java/com/wireguard/config/ConfigTest.java
index 1893cfa6..92143e72 100644
--- a/tunnel/src/test/java/com/wireguard/config/ConfigTest.java
+++ b/tunnel/src/test/java/com/wireguard/config/ConfigTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/tunnel/tools/CMakeLists.txt b/tunnel/tools/CMakeLists.txt
index a4af72aa..4ab5f831 100644
--- a/tunnel/tools/CMakeLists.txt
+++ b/tunnel/tools/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
-# Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+# Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
 
 cmake_minimum_required(VERSION 3.4.1)
 project("WireGuard")
diff --git a/tunnel/tools/libwg-go/Makefile b/tunnel/tools/libwg-go/Makefile
index 058f456b..e8cf5815 100644
--- a/tunnel/tools/libwg-go/Makefile
+++ b/tunnel/tools/libwg-go/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
-# Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+# Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
 
 BUILDDIR ?= $(CURDIR)/build
 DESTDIR ?= $(CURDIR)/out
diff --git a/tunnel/tools/ndk-compat/compat.c b/tunnel/tools/ndk-compat/compat.c
index 596dbd81..a610da4c 100644
--- a/tunnel/tools/ndk-compat/compat.c
+++ b/tunnel/tools/ndk-compat/compat.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: BSD
  *
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  *
  */
 
diff --git a/tunnel/tools/ndk-compat/compat.h b/tunnel/tools/ndk-compat/compat.h
index 820f1015..73cce668 100644
--- a/tunnel/tools/ndk-compat/compat.h
+++ b/tunnel/tools/ndk-compat/compat.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: BSD
  *
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  *
  */
 
diff --git a/ui/src/main/java/com/wireguard/android/Application.kt b/ui/src/main/java/com/wireguard/android/Application.kt
index 7573bdad..cac1f8d8 100644
--- a/ui/src/main/java/com/wireguard/android/Application.kt
+++ b/ui/src/main/java/com/wireguard/android/Application.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android
diff --git a/ui/src/main/java/com/wireguard/android/BootShutdownReceiver.kt b/ui/src/main/java/com/wireguard/android/BootShutdownReceiver.kt
index b8bb4f6a..23775f44 100644
--- a/ui/src/main/java/com/wireguard/android/BootShutdownReceiver.kt
+++ b/ui/src/main/java/com/wireguard/android/BootShutdownReceiver.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android
diff --git a/ui/src/main/java/com/wireguard/android/QuickTileService.kt b/ui/src/main/java/com/wireguard/android/QuickTileService.kt
index 8b35f9b4..ed208c50 100644
--- a/ui/src/main/java/com/wireguard/android/QuickTileService.kt
+++ b/ui/src/main/java/com/wireguard/android/QuickTileService.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android
diff --git a/ui/src/main/java/com/wireguard/android/activity/BaseActivity.kt b/ui/src/main/java/com/wireguard/android/activity/BaseActivity.kt
index bdf0f8d4..6c85be57 100644
--- a/ui/src/main/java/com/wireguard/android/activity/BaseActivity.kt
+++ b/ui/src/main/java/com/wireguard/android/activity/BaseActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.activity
diff --git a/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt b/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt
index dd100cf9..fe75be35 100644
--- a/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt
+++ b/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/ui/src/main/java/com/wireguard/android/activity/MainActivity.kt b/ui/src/main/java/com/wireguard/android/activity/MainActivity.kt
index aac08e18..2276e873 100644
--- a/ui/src/main/java/com/wireguard/android/activity/MainActivity.kt
+++ b/ui/src/main/java/com/wireguard/android/activity/MainActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.activity
diff --git a/ui/src/main/java/com/wireguard/android/activity/SettingsActivity.kt b/ui/src/main/java/com/wireguard/android/activity/SettingsActivity.kt
index df025163..aa768e0b 100644
--- a/ui/src/main/java/com/wireguard/android/activity/SettingsActivity.kt
+++ b/ui/src/main/java/com/wireguard/android/activity/SettingsActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.activity
diff --git a/ui/src/main/java/com/wireguard/android/activity/ThemeChangeAwareActivity.kt b/ui/src/main/java/com/wireguard/android/activity/ThemeChangeAwareActivity.kt
index 2158858b..06f621c4 100644
--- a/ui/src/main/java/com/wireguard/android/activity/ThemeChangeAwareActivity.kt
+++ b/ui/src/main/java/com/wireguard/android/activity/ThemeChangeAwareActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.activity
diff --git a/ui/src/main/java/com/wireguard/android/activity/TunnelCreatorActivity.kt b/ui/src/main/java/com/wireguard/android/activity/TunnelCreatorActivity.kt
index 28d5da3a..b3fccee3 100644
--- a/ui/src/main/java/com/wireguard/android/activity/TunnelCreatorActivity.kt
+++ b/ui/src/main/java/com/wireguard/android/activity/TunnelCreatorActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.activity
diff --git a/ui/src/main/java/com/wireguard/android/activity/TunnelToggleActivity.kt b/ui/src/main/java/com/wireguard/android/activity/TunnelToggleActivity.kt
index ebf059a5..ee95ce40 100644
--- a/ui/src/main/java/com/wireguard/android/activity/TunnelToggleActivity.kt
+++ b/ui/src/main/java/com/wireguard/android/activity/TunnelToggleActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.activity
diff --git a/ui/src/main/java/com/wireguard/android/activity/TvMainActivity.kt b/ui/src/main/java/com/wireguard/android/activity/TvMainActivity.kt
index 7b0737e8..a0903793 100644
--- a/ui/src/main/java/com/wireguard/android/activity/TvMainActivity.kt
+++ b/ui/src/main/java/com/wireguard/android/activity/TvMainActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/ui/src/main/java/com/wireguard/android/configStore/ConfigStore.kt b/ui/src/main/java/com/wireguard/android/configStore/ConfigStore.kt
index 5b66f830..7336e78f 100644
--- a/ui/src/main/java/com/wireguard/android/configStore/ConfigStore.kt
+++ b/ui/src/main/java/com/wireguard/android/configStore/ConfigStore.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.configStore
diff --git a/ui/src/main/java/com/wireguard/android/configStore/FileConfigStore.kt b/ui/src/main/java/com/wireguard/android/configStore/FileConfigStore.kt
index 1099382d..30a2674f 100644
--- a/ui/src/main/java/com/wireguard/android/configStore/FileConfigStore.kt
+++ b/ui/src/main/java/com/wireguard/android/configStore/FileConfigStore.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.configStore
diff --git a/ui/src/main/java/com/wireguard/android/databinding/BindingAdapters.kt b/ui/src/main/java/com/wireguard/android/databinding/BindingAdapters.kt
index 9c8a0dc2..d823fa8d 100644
--- a/ui/src/main/java/com/wireguard/android/databinding/BindingAdapters.kt
+++ b/ui/src/main/java/com/wireguard/android/databinding/BindingAdapters.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.databinding
diff --git a/ui/src/main/java/com/wireguard/android/databinding/ItemChangeListener.kt b/ui/src/main/java/com/wireguard/android/databinding/ItemChangeListener.kt
index d1a1352b..93333cb6 100644
--- a/ui/src/main/java/com/wireguard/android/databinding/ItemChangeListener.kt
+++ b/ui/src/main/java/com/wireguard/android/databinding/ItemChangeListener.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.databinding
diff --git a/ui/src/main/java/com/wireguard/android/databinding/Keyed.kt b/ui/src/main/java/com/wireguard/android/databinding/Keyed.kt
index 1122f552..f91581d0 100644
--- a/ui/src/main/java/com/wireguard/android/databinding/Keyed.kt
+++ b/ui/src/main/java/com/wireguard/android/databinding/Keyed.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.databinding
diff --git a/ui/src/main/java/com/wireguard/android/databinding/ObservableKeyedArrayList.kt b/ui/src/main/java/com/wireguard/android/databinding/ObservableKeyedArrayList.kt
index 9963255a..947644b3 100644
--- a/ui/src/main/java/com/wireguard/android/databinding/ObservableKeyedArrayList.kt
+++ b/ui/src/main/java/com/wireguard/android/databinding/ObservableKeyedArrayList.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.databinding
diff --git a/ui/src/main/java/com/wireguard/android/databinding/ObservableKeyedRecyclerViewAdapter.kt b/ui/src/main/java/com/wireguard/android/databinding/ObservableKeyedRecyclerViewAdapter.kt
index 003ff74e..91223ad1 100644
--- a/ui/src/main/java/com/wireguard/android/databinding/ObservableKeyedRecyclerViewAdapter.kt
+++ b/ui/src/main/java/com/wireguard/android/databinding/ObservableKeyedRecyclerViewAdapter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.databinding
diff --git a/ui/src/main/java/com/wireguard/android/databinding/ObservableSortedKeyedArrayList.kt b/ui/src/main/java/com/wireguard/android/databinding/ObservableSortedKeyedArrayList.kt
index a8738627..a09d726f 100644
--- a/ui/src/main/java/com/wireguard/android/databinding/ObservableSortedKeyedArrayList.kt
+++ b/ui/src/main/java/com/wireguard/android/databinding/ObservableSortedKeyedArrayList.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.databinding
diff --git a/ui/src/main/java/com/wireguard/android/fragment/AddTunnelsSheet.kt b/ui/src/main/java/com/wireguard/android/fragment/AddTunnelsSheet.kt
index c56462d6..f54f88f2 100644
--- a/ui/src/main/java/com/wireguard/android/fragment/AddTunnelsSheet.kt
+++ b/ui/src/main/java/com/wireguard/android/fragment/AddTunnelsSheet.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.fragment
diff --git a/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt
index 1a40a1cd..6f1c5418 100644
--- a/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt
+++ b/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.fragment
diff --git a/ui/src/main/java/com/wireguard/android/fragment/BaseFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/BaseFragment.kt
index 783f5722..569a6217 100644
--- a/ui/src/main/java/com/wireguard/android/fragment/BaseFragment.kt
+++ b/ui/src/main/java/com/wireguard/android/fragment/BaseFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.fragment
diff --git a/ui/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.kt
index 0c4e9d20..df6908b1 100644
--- a/ui/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.kt
+++ b/ui/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.fragment
diff --git a/ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.kt
index 7046cb96..7a76edbe 100644
--- a/ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.kt
+++ b/ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.fragment
diff --git a/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt
index 6c6f53f9..872d0eab 100644
--- a/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt
+++ b/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.fragment
diff --git a/ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt
index 390a6396..53098eb8 100644
--- a/ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt
+++ b/ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.fragment
diff --git a/ui/src/main/java/com/wireguard/android/model/ApplicationData.kt b/ui/src/main/java/com/wireguard/android/model/ApplicationData.kt
index c4cb168b..f3892424 100644
--- a/ui/src/main/java/com/wireguard/android/model/ApplicationData.kt
+++ b/ui/src/main/java/com/wireguard/android/model/ApplicationData.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.model
diff --git a/ui/src/main/java/com/wireguard/android/model/ObservableTunnel.kt b/ui/src/main/java/com/wireguard/android/model/ObservableTunnel.kt
index 252e8759..c3e3405e 100644
--- a/ui/src/main/java/com/wireguard/android/model/ObservableTunnel.kt
+++ b/ui/src/main/java/com/wireguard/android/model/ObservableTunnel.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.model
diff --git a/ui/src/main/java/com/wireguard/android/model/TunnelComparator.kt b/ui/src/main/java/com/wireguard/android/model/TunnelComparator.kt
index 0baa44e8..e6b46a54 100644
--- a/ui/src/main/java/com/wireguard/android/model/TunnelComparator.kt
+++ b/ui/src/main/java/com/wireguard/android/model/TunnelComparator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/ui/src/main/java/com/wireguard/android/model/TunnelManager.kt b/ui/src/main/java/com/wireguard/android/model/TunnelManager.kt
index ec796164..e7bb751b 100644
--- a/ui/src/main/java/com/wireguard/android/model/TunnelManager.kt
+++ b/ui/src/main/java/com/wireguard/android/model/TunnelManager.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.model
diff --git a/ui/src/main/java/com/wireguard/android/preference/KernelModuleEnablerPreference.kt b/ui/src/main/java/com/wireguard/android/preference/KernelModuleEnablerPreference.kt
index 15f1dcec..20de8e93 100644
--- a/ui/src/main/java/com/wireguard/android/preference/KernelModuleEnablerPreference.kt
+++ b/ui/src/main/java/com/wireguard/android/preference/KernelModuleEnablerPreference.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.preference
diff --git a/ui/src/main/java/com/wireguard/android/preference/PreferencesPreferenceDataStore.kt b/ui/src/main/java/com/wireguard/android/preference/PreferencesPreferenceDataStore.kt
index 3f1a7223..1a491684 100644
--- a/ui/src/main/java/com/wireguard/android/preference/PreferencesPreferenceDataStore.kt
+++ b/ui/src/main/java/com/wireguard/android/preference/PreferencesPreferenceDataStore.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/ui/src/main/java/com/wireguard/android/preference/ToolsInstallerPreference.kt b/ui/src/main/java/com/wireguard/android/preference/ToolsInstallerPreference.kt
index 7c6283ba..dac80e88 100644
--- a/ui/src/main/java/com/wireguard/android/preference/ToolsInstallerPreference.kt
+++ b/ui/src/main/java/com/wireguard/android/preference/ToolsInstallerPreference.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.preference
diff --git a/ui/src/main/java/com/wireguard/android/preference/VersionPreference.kt b/ui/src/main/java/com/wireguard/android/preference/VersionPreference.kt
index 27065d28..31c751d2 100644
--- a/ui/src/main/java/com/wireguard/android/preference/VersionPreference.kt
+++ b/ui/src/main/java/com/wireguard/android/preference/VersionPreference.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.preference
diff --git a/ui/src/main/java/com/wireguard/android/preference/ZipExporterPreference.kt b/ui/src/main/java/com/wireguard/android/preference/ZipExporterPreference.kt
index 65880303..ced95b69 100644
--- a/ui/src/main/java/com/wireguard/android/preference/ZipExporterPreference.kt
+++ b/ui/src/main/java/com/wireguard/android/preference/ZipExporterPreference.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.preference
diff --git a/ui/src/main/java/com/wireguard/android/util/AdminKnobs.kt b/ui/src/main/java/com/wireguard/android/util/AdminKnobs.kt
index c7a683a3..430e904d 100644
--- a/ui/src/main/java/com/wireguard/android/util/AdminKnobs.kt
+++ b/ui/src/main/java/com/wireguard/android/util/AdminKnobs.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/ui/src/main/java/com/wireguard/android/util/BiometricAuthenticator.kt b/ui/src/main/java/com/wireguard/android/util/BiometricAuthenticator.kt
index d187a4c8..fe36898f 100644
--- a/ui/src/main/java/com/wireguard/android/util/BiometricAuthenticator.kt
+++ b/ui/src/main/java/com/wireguard/android/util/BiometricAuthenticator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/ui/src/main/java/com/wireguard/android/util/ClipboardUtils.kt b/ui/src/main/java/com/wireguard/android/util/ClipboardUtils.kt
index 65fdf078..6a0d54ba 100644
--- a/ui/src/main/java/com/wireguard/android/util/ClipboardUtils.kt
+++ b/ui/src/main/java/com/wireguard/android/util/ClipboardUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.util
diff --git a/ui/src/main/java/com/wireguard/android/util/DownloadsFileSaver.kt b/ui/src/main/java/com/wireguard/android/util/DownloadsFileSaver.kt
index 6a7256e0..8538e75e 100644
--- a/ui/src/main/java/com/wireguard/android/util/DownloadsFileSaver.kt
+++ b/ui/src/main/java/com/wireguard/android/util/DownloadsFileSaver.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.util
diff --git a/ui/src/main/java/com/wireguard/android/util/ErrorMessages.kt b/ui/src/main/java/com/wireguard/android/util/ErrorMessages.kt
index 60c6b878..27495b60 100644
--- a/ui/src/main/java/com/wireguard/android/util/ErrorMessages.kt
+++ b/ui/src/main/java/com/wireguard/android/util/ErrorMessages.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.util
diff --git a/ui/src/main/java/com/wireguard/android/util/Extensions.kt b/ui/src/main/java/com/wireguard/android/util/Extensions.kt
index f653cb61..98f94af9 100644
--- a/ui/src/main/java/com/wireguard/android/util/Extensions.kt
+++ b/ui/src/main/java/com/wireguard/android/util/Extensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/ui/src/main/java/com/wireguard/android/util/QrCodeFromFileScanner.kt b/ui/src/main/java/com/wireguard/android/util/QrCodeFromFileScanner.kt
index 3e54a52a..135fc1f3 100644
--- a/ui/src/main/java/com/wireguard/android/util/QrCodeFromFileScanner.kt
+++ b/ui/src/main/java/com/wireguard/android/util/QrCodeFromFileScanner.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2022 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/ui/src/main/java/com/wireguard/android/util/QuantityFormatter.kt b/ui/src/main/java/com/wireguard/android/util/QuantityFormatter.kt
index 4a9ffed4..974fe530 100644
--- a/ui/src/main/java/com/wireguard/android/util/QuantityFormatter.kt
+++ b/ui/src/main/java/com/wireguard/android/util/QuantityFormatter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/ui/src/main/java/com/wireguard/android/util/TunnelImporter.kt b/ui/src/main/java/com/wireguard/android/util/TunnelImporter.kt
index 64993cda..e66691e8 100644
--- a/ui/src/main/java/com/wireguard/android/util/TunnelImporter.kt
+++ b/ui/src/main/java/com/wireguard/android/util/TunnelImporter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/ui/src/main/java/com/wireguard/android/util/UserKnobs.kt b/ui/src/main/java/com/wireguard/android/util/UserKnobs.kt
index 224c1e1a..52672e45 100644
--- a/ui/src/main/java/com/wireguard/android/util/UserKnobs.kt
+++ b/ui/src/main/java/com/wireguard/android/util/UserKnobs.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/ui/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.kt b/ui/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.kt
index ccfbce34..0e3c9aa1 100644
--- a/ui/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.kt
+++ b/ui/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.viewmodel
diff --git a/ui/src/main/java/com/wireguard/android/viewmodel/InterfaceProxy.kt b/ui/src/main/java/com/wireguard/android/viewmodel/InterfaceProxy.kt
index 2792f749..004ebed1 100644
--- a/ui/src/main/java/com/wireguard/android/viewmodel/InterfaceProxy.kt
+++ b/ui/src/main/java/com/wireguard/android/viewmodel/InterfaceProxy.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.viewmodel
diff --git a/ui/src/main/java/com/wireguard/android/viewmodel/PeerProxy.kt b/ui/src/main/java/com/wireguard/android/viewmodel/PeerProxy.kt
index d1cb1046..4bf2ce9c 100644
--- a/ui/src/main/java/com/wireguard/android/viewmodel/PeerProxy.kt
+++ b/ui/src/main/java/com/wireguard/android/viewmodel/PeerProxy.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.viewmodel
diff --git a/ui/src/main/java/com/wireguard/android/widget/KeyInputFilter.kt b/ui/src/main/java/com/wireguard/android/widget/KeyInputFilter.kt
index 6f941c86..bf42166d 100644
--- a/ui/src/main/java/com/wireguard/android/widget/KeyInputFilter.kt
+++ b/ui/src/main/java/com/wireguard/android/widget/KeyInputFilter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.widget
diff --git a/ui/src/main/java/com/wireguard/android/widget/MultiselectableRelativeLayout.kt b/ui/src/main/java/com/wireguard/android/widget/MultiselectableRelativeLayout.kt
index 38aee443..511cd287 100644
--- a/ui/src/main/java/com/wireguard/android/widget/MultiselectableRelativeLayout.kt
+++ b/ui/src/main/java/com/wireguard/android/widget/MultiselectableRelativeLayout.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.widget
diff --git a/ui/src/main/java/com/wireguard/android/widget/NameInputFilter.kt b/ui/src/main/java/com/wireguard/android/widget/NameInputFilter.kt
index a047dab4..7af514d9 100644
--- a/ui/src/main/java/com/wireguard/android/widget/NameInputFilter.kt
+++ b/ui/src/main/java/com/wireguard/android/widget/NameInputFilter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.widget
diff --git a/ui/src/main/java/com/wireguard/android/widget/SlashDrawable.kt b/ui/src/main/java/com/wireguard/android/widget/SlashDrawable.kt
index 2ebf4fd8..8fcee9df 100644
--- a/ui/src/main/java/com/wireguard/android/widget/SlashDrawable.kt
+++ b/ui/src/main/java/com/wireguard/android/widget/SlashDrawable.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2018 The Android Open Source Project
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.widget
diff --git a/ui/src/main/java/com/wireguard/android/widget/ToggleSwitch.kt b/ui/src/main/java/com/wireguard/android/widget/ToggleSwitch.kt
index 0b5fa09f..fe415fd5 100644
--- a/ui/src/main/java/com/wireguard/android/widget/ToggleSwitch.kt
+++ b/ui/src/main/java/com/wireguard/android/widget/ToggleSwitch.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2013 The Android Open Source Project
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.widget
diff --git a/ui/src/main/res/drawable/ic_arrow_back.xml b/ui/src/main/res/drawable/ic_arrow_back.xml
index 05d8f7d7..0df5dc6c 100644
--- a/ui/src/main/res/drawable/ic_arrow_back.xml
+++ b/ui/src/main/res/drawable/ic_arrow_back.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+  ~ Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
   ~ SPDX-License-Identifier: Apache-2.0
   -->
 
diff --git a/ui/src/main/res/drawable/tv_logo_banner.xml b/ui/src/main/res/drawable/tv_logo_banner.xml
index 646967d6..734702f3 100644
--- a/ui/src/main/res/drawable/tv_logo_banner.xml
+++ b/ui/src/main/res/drawable/tv_logo_banner.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+  ~ Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
   ~ SPDX-License-Identifier: Apache-2.0
   -->
 
diff --git a/ui/src/main/res/layout/log_viewer_activity.xml b/ui/src/main/res/layout/log_viewer_activity.xml
index c3780470..2a377a15 100644
--- a/ui/src/main/res/layout/log_viewer_activity.xml
+++ b/ui/src/main/res/layout/log_viewer_activity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+  ~ Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
   ~ SPDX-License-Identifier: Apache-2.0
   -->
 
diff --git a/ui/src/main/res/layout/log_viewer_entry.xml b/ui/src/main/res/layout/log_viewer_entry.xml
index 73680f0c..38e71d35 100644
--- a/ui/src/main/res/layout/log_viewer_entry.xml
+++ b/ui/src/main/res/layout/log_viewer_entry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+  ~ Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
   ~ SPDX-License-Identifier: Apache-2.0
   -->
 
diff --git a/ui/src/main/res/xml/app_restrictions.xml b/ui/src/main/res/xml/app_restrictions.xml
index fefa8a80..2eaa7bc5 100644
--- a/ui/src/main/res/xml/app_restrictions.xml
+++ b/ui/src/main/res/xml/app_restrictions.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+  ~ Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
   ~ SPDX-License-Identifier: Apache-2.0
   -->
 
-- 
cgit v1.2.3


From a26b7c594a7fafac778baf0f6852d9983ebdd04d Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Tue, 21 Mar 2023 15:46:59 +0100
Subject: strings: sync with crowdin

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 ui/src/main/res/values-ca-rES/strings.xml | 6 +++---
 ui/src/main/res/values-cs-rCZ/strings.xml | 6 +++---
 ui/src/main/res/values-de/strings.xml     | 8 ++++----
 ui/src/main/res/values-es-rES/strings.xml | 8 ++++----
 ui/src/main/res/values-fa-rIR/strings.xml | 9 +++++----
 ui/src/main/res/values-fr/strings.xml     | 8 ++++----
 ui/src/main/res/values-hi-rIN/strings.xml | 8 ++++----
 ui/src/main/res/values-in/strings.xml     | 8 ++++----
 ui/src/main/res/values-it/strings.xml     | 8 ++++----
 ui/src/main/res/values-ja/strings.xml     | 8 ++++----
 ui/src/main/res/values-ko-rKR/strings.xml | 8 ++++----
 ui/src/main/res/values-no-rNO/strings.xml | 8 ++++----
 ui/src/main/res/values-pa-rIN/strings.xml | 8 ++++----
 ui/src/main/res/values-pl-rPL/strings.xml | 8 ++++----
 ui/src/main/res/values-pt-rPT/strings.xml | 8 ++++----
 ui/src/main/res/values-ro-rRO/strings.xml | 8 ++++----
 ui/src/main/res/values-ru/strings.xml     | 8 ++++----
 ui/src/main/res/values-sk-rSK/strings.xml | 2 +-
 ui/src/main/res/values-sl/strings.xml     | 8 ++++----
 ui/src/main/res/values-sv-rSE/strings.xml | 8 ++++----
 ui/src/main/res/values-tr-rTR/strings.xml | 8 ++++----
 ui/src/main/res/values-uk-rUA/strings.xml | 8 ++++----
 ui/src/main/res/values-vi-rVN/strings.xml | 5 +++++
 ui/src/main/res/values-zh-rCN/strings.xml | 8 ++++----
 ui/src/main/res/values-zh-rTW/strings.xml | 4 ++--
 25 files changed, 95 insertions(+), 89 deletions(-)
 create mode 100644 ui/src/main/res/values-vi-rVN/strings.xml

diff --git a/ui/src/main/res/values-ca-rES/strings.xml b/ui/src/main/res/values-ca-rES/strings.xml
index 06ec2c50..7db86fd0 100644
--- a/ui/src/main/res/values-ca-rES/strings.xml
+++ b/ui/src/main/res/values-ca-rES/strings.xml
@@ -142,9 +142,9 @@
     <string name="log_viewer_pref_title">Mostra el registre d\'aplicació</string>
     <string name="log_viewer_title">Registre</string>
     <string name="logcat_error">No es pot executar logcat: </string>
-    <string name="module_enabler_disabled_summary">El mòdul experimental del kernel pot millorar el rendiment</string>
-    <string name="module_enabler_disabled_title">Activa el backend del mòdul del kernel</string>
-    <string name="module_enabler_enabled_title">Desactiva el backend del mòdul del kernel</string>
+    <string name="module_disabler_disabled_summary">El mòdul experimental del kernel pot millorar el rendiment</string>
+    <string name="module_disabler_disabled_title">Activa el backend del mòdul del kernel</string>
+    <string name="module_disabler_enabled_title">Desactiva el backend del mòdul del kernel</string>
     <string name="module_installer_error">Alguna cosa ha anat malament. Si us plau, prova de nou</string>
     <string name="module_installer_not_found">El vostre dispositiu no té mòduls disponibles</string>
     <string name="module_installer_title">Descàrega i instala el mòdul kernel</string>
diff --git a/ui/src/main/res/values-cs-rCZ/strings.xml b/ui/src/main/res/values-cs-rCZ/strings.xml
index 3b50d711..a52e0a9f 100644
--- a/ui/src/main/res/values-cs-rCZ/strings.xml
+++ b/ui/src/main/res/values-cs-rCZ/strings.xml
@@ -119,9 +119,9 @@
     <string name="log_viewer_pref_title">Zobrazit log aplikace</string>
     <string name="log_viewer_title">Log</string>
     <string name="logcat_error">Nelze spustit logcat: </string>
-    <string name="module_enabler_disabled_summary">Experimentální kernel modul může zlepšit výkon</string>
-    <string name="module_enabler_disabled_title">Povolit backend kernel modulu</string>
-    <string name="module_enabler_enabled_title">Vypnout backend kernel modulu</string>
+    <string name="module_disabler_disabled_summary">Experimentální kernel modul může zlepšit výkon</string>
+    <string name="module_disabler_disabled_title">Povolit backend kernel modulu</string>
+    <string name="module_disabler_enabled_title">Vypnout backend kernel modulu</string>
     <string name="module_installer_error">Něco se pokazilo. Zkuste to prosím znovu</string>
     <string name="module_installer_initial">Experimentální kernel modul může zlepšit výkon</string>
     <string name="module_installer_not_found">Pro toto zařízení nejsou dostupné žádné moduly</string>
diff --git a/ui/src/main/res/values-de/strings.xml b/ui/src/main/res/values-de/strings.xml
index db012dbf..57edd1da 100644
--- a/ui/src/main/res/values-de/strings.xml
+++ b/ui/src/main/res/values-de/strings.xml
@@ -142,10 +142,10 @@
     <string name="log_viewer_pref_title">Anwendungs-Protokoll anzeigen</string>
     <string name="log_viewer_title">Protokoll</string>
     <string name="logcat_error">Konnte logcat nicht ausführen: </string>
-    <string name="module_enabler_disabled_summary">Das experimentelle Kernelmodul kann die Leistung verbessern</string>
-    <string name="module_enabler_disabled_title">Kernelmodul-Backend aktivieren</string>
-    <string name="module_enabler_enabled_summary">Das langsamere Userspace-Backend kann die Stabilität verbessern</string>
-    <string name="module_enabler_enabled_title">Kernelmodul-Backend deaktivieren</string>
+    <string name="module_disabler_disabled_summary">Das experimentelle Kernelmodul kann die Leistung verbessern</string>
+    <string name="module_disabler_disabled_title">Kernelmodul-Backend aktivieren</string>
+    <string name="module_disabler_enabled_summary">Das langsamere Userspace-Backend kann die Stabilität verbessern</string>
+    <string name="module_disabler_enabled_title">Kernelmodul-Backend deaktivieren</string>
     <string name="module_installer_error">Es ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut</string>
     <string name="module_installer_initial">Das experimentelle Kernelmodul kann die Leistung verbessern</string>
     <string name="module_installer_not_found">Für Ihr Gerät sind keine Module verfügbar</string>
diff --git a/ui/src/main/res/values-es-rES/strings.xml b/ui/src/main/res/values-es-rES/strings.xml
index da5b89fb..478a5a7d 100644
--- a/ui/src/main/res/values-es-rES/strings.xml
+++ b/ui/src/main/res/values-es-rES/strings.xml
@@ -142,10 +142,10 @@
     <string name="log_viewer_pref_title">Ver registro de aplicación</string>
     <string name="log_viewer_title">Registro</string>
     <string name="logcat_error">No se puede ejecutar logcat: </string>
-    <string name="module_enabler_disabled_summary">El módulo experimental del kernel puede mejorar el rendimiento</string>
-    <string name="module_enabler_disabled_title">Habilitar backend del módulo del kernel</string>
-    <string name="module_enabler_enabled_summary">El backend más lento del espacio de usuario puede mejorar la estabilidad</string>
-    <string name="module_enabler_enabled_title">Desactivar backend del módulo del kernel</string>
+    <string name="module_disabler_disabled_summary">El módulo experimental del kernel puede mejorar el rendimiento</string>
+    <string name="module_disabler_disabled_title">Habilitar backend del módulo del kernel</string>
+    <string name="module_disabler_enabled_summary">El backend más lento del espacio de usuario puede mejorar la estabilidad</string>
+    <string name="module_disabler_enabled_title">Desactivar backend del módulo del kernel</string>
     <string name="module_installer_error">Ocurrió un error. Intente de nuevo</string>
     <string name="module_installer_initial">El módulo experimental del kernel puede mejorar el rendimiento</string>
     <string name="module_installer_not_found">No hay módulos disponibles para tu dispositivo</string>
diff --git a/ui/src/main/res/values-fa-rIR/strings.xml b/ui/src/main/res/values-fa-rIR/strings.xml
index cc3df4de..b1f3793b 100644
--- a/ui/src/main/res/values-fa-rIR/strings.xml
+++ b/ui/src/main/res/values-fa-rIR/strings.xml
@@ -97,6 +97,7 @@
     <string name="create_output_dir_error">نمی‌توان دایرکتوری خروجی را ایجاد کرد</string>
     <string name="create_temp_dir_error">نمی‌توان دایرکتوری موقت محلی را ساخت</string>
     <string name="create_tunnel">ساختن تونل</string>
+    <string name="copied_to_clipboard">متن در کلیپ‌بورد کپی شد</string>
     <string name="dark_theme_summary_off">اکنون از پوسته روشن(روز) استفاده می‌شود</string>
     <string name="dark_theme_summary_on">اکنون از پوسته تاریک(شب) استفاده می‌شود</string>
     <string name="dark_theme_title">استفاده از پوسته تاریک</string>
@@ -142,10 +143,10 @@
     <string name="log_viewer_pref_title">نمایش گزارش رویداد برنامه</string>
     <string name="log_viewer_title">گزارش رویداد</string>
     <string name="logcat_error">نمی‌توان logcat را اجرا کرد: </string>
-    <string name="module_enabler_disabled_summary">ماژول آزمایشی‌ِ کرنل می تواند کارایی را افزایش دهد</string>
-    <string name="module_enabler_disabled_title">فعال‌سازی ماژول کرنل ِبک اند</string>
-    <string name="module_enabler_enabled_summary">فضای کاربری کند ممکن است پایداری را بهبود ببخشد</string>
-    <string name="module_enabler_enabled_title">غیرفعال‌سازی پس‌زمینه واحد هسته</string>
+    <string name="module_disabler_disabled_summary">ماژول آزمایشی‌ِ کرنل می تواند کارایی را افزایش دهد</string>
+    <string name="module_disabler_disabled_title">فعال‌سازی ماژول کرنل ِبک اند</string>
+    <string name="module_disabler_enabled_summary">فضای کاربری کند ممکن است پایداری را بهبود ببخشد</string>
+    <string name="module_disabler_enabled_title">غیرفعال‌سازی پس‌زمینه واحد هسته</string>
     <string name="module_installer_error">مشکلی پیش آمد. لطفا دوباره تلاش کنید</string>
     <string name="module_installer_initial">ماژول آزمایشی‌ِ کرنل می تواند کارایی را افزایش دهد</string>
     <string name="module_installer_not_found">هیچ واحدی برای دستگاه شما در دسترس نیست</string>
diff --git a/ui/src/main/res/values-fr/strings.xml b/ui/src/main/res/values-fr/strings.xml
index 33f413b1..17abc8ab 100644
--- a/ui/src/main/res/values-fr/strings.xml
+++ b/ui/src/main/res/values-fr/strings.xml
@@ -142,10 +142,10 @@
     <string name="log_viewer_pref_title">Afficher le journal de l\'application</string>
     <string name="log_viewer_title">Journal</string>
     <string name="logcat_error">Impossible d\'exécuter logcat : </string>
-    <string name="module_enabler_disabled_summary">Le module expérimental du noyau peut améliorer les performances</string>
-    <string name="module_enabler_disabled_title">Activer le backend du module du noyau</string>
-    <string name="module_enabler_enabled_summary">Le backend plus lent de l\'espace utilisateur peut améliorer la stabilité</string>
-    <string name="module_enabler_enabled_title">Désactiver le backend du module du noyau</string>
+    <string name="module_disabler_disabled_summary">Le module expérimental du noyau peut améliorer les performances</string>
+    <string name="module_disabler_disabled_title">Activer le backend du module du noyau</string>
+    <string name="module_disabler_enabled_summary">Le backend plus lent de l\'espace utilisateur peut améliorer la stabilité</string>
+    <string name="module_disabler_enabled_title">Désactiver le backend du module du noyau</string>
     <string name="module_installer_error">Une erreur est survenue. Veuillez réessayer</string>
     <string name="module_installer_initial">Le module expérimental du noyau peut améliorer les performances</string>
     <string name="module_installer_not_found">Aucun module n\'est disponible pour votre appareil</string>
diff --git a/ui/src/main/res/values-hi-rIN/strings.xml b/ui/src/main/res/values-hi-rIN/strings.xml
index b614b475..e16d69ea 100644
--- a/ui/src/main/res/values-hi-rIN/strings.xml
+++ b/ui/src/main/res/values-hi-rIN/strings.xml
@@ -132,10 +132,10 @@
     <string name="log_viewer_pref_title">एप्लिकेशन लॉग देखें</string>
     <string name="log_viewer_title">लॉग</string>
     <string name="logcat_error">लॉगकैट चलाने में असमर्थ: </string>
-    <string name="module_enabler_disabled_summary">प्रयोगात्मक कर्नेल मॉड्यूल प्रदर्शन में सुधार कर सकता है</string>
-    <string name="module_enabler_disabled_title">कर्नेल मॉड्यूल बैकएंड सक्षम करें</string>
-    <string name="module_enabler_enabled_summary">धीमे यूजरस्पेस बैकएंड में स्थिरता में सुधार हो सकता है</string>
-    <string name="module_enabler_enabled_title">कर्नेल मॉड्यूल बैकएंड को अक्षम करें</string>
+    <string name="module_disabler_disabled_summary">प्रयोगात्मक कर्नेल मॉड्यूल प्रदर्शन में सुधार कर सकता है</string>
+    <string name="module_disabler_disabled_title">कर्नेल मॉड्यूल बैकएंड सक्षम करें</string>
+    <string name="module_disabler_enabled_summary">धीमे यूजरस्पेस बैकएंड में स्थिरता में सुधार हो सकता है</string>
+    <string name="module_disabler_enabled_title">कर्नेल मॉड्यूल बैकएंड को अक्षम करें</string>
     <string name="module_installer_error">कुछ गलत हो गया। कृपया पुन: प्रयास करें</string>
     <string name="module_installer_initial">प्रयोगात्मक कर्नेल मॉड्यूल प्रदर्शन में सुधार कर सकता है</string>
     <string name="module_installer_not_found">आपके डिवाइस के लिए कोई मॉड्यूल उपलब्ध नहीं हैं</string>
diff --git a/ui/src/main/res/values-in/strings.xml b/ui/src/main/res/values-in/strings.xml
index 7852ffd6..e8e664de 100644
--- a/ui/src/main/res/values-in/strings.xml
+++ b/ui/src/main/res/values-in/strings.xml
@@ -129,10 +129,10 @@
     <string name="log_viewer_pref_title">Lihat log aplikasi</string>
     <string name="log_viewer_title">Log</string>
     <string name="logcat_error">Tidak bisa menjalankan logcat: </string>
-    <string name="module_enabler_disabled_summary">Modul kernel eksperimental dapat meningkatkan kinerja</string>
-    <string name="module_enabler_disabled_title">Aktifkan backend modul kernel</string>
-    <string name="module_enabler_enabled_summary">Backend userspace yang lebih lambat dapat meningkatkan stabilitas</string>
-    <string name="module_enabler_enabled_title">Nonaktifkan backend modul kernel</string>
+    <string name="module_disabler_disabled_summary">Modul kernel eksperimental dapat meningkatkan kinerja</string>
+    <string name="module_disabler_disabled_title">Aktifkan backend modul kernel</string>
+    <string name="module_disabler_enabled_summary">Backend userspace yang lebih lambat dapat meningkatkan stabilitas</string>
+    <string name="module_disabler_enabled_title">Nonaktifkan backend modul kernel</string>
     <string name="module_installer_error">Ada yang salah. Silakan coba lagi</string>
     <string name="module_installer_initial">Modul kernel eksperimental dapat meningkatkan kinerja</string>
     <string name="module_installer_not_found">Tidak tersedia modul untuk perangkat anda</string>
diff --git a/ui/src/main/res/values-it/strings.xml b/ui/src/main/res/values-it/strings.xml
index 519d4b52..7b9a2d3f 100644
--- a/ui/src/main/res/values-it/strings.xml
+++ b/ui/src/main/res/values-it/strings.xml
@@ -142,10 +142,10 @@
     <string name="log_viewer_pref_title">Visualizza log dell\'applicazione</string>
     <string name="log_viewer_title">Log</string>
     <string name="logcat_error">Impossibile eseguire logcat: </string>
-    <string name="module_enabler_disabled_summary">Il modulo sperimentale del kernel può migliorare le prestazioni</string>
-    <string name="module_enabler_disabled_title">Abilita il backend del modulo del kernel</string>
-    <string name="module_enabler_enabled_summary">Il backend in userspace più lento potrebbe migliorare la stabilità</string>
-    <string name="module_enabler_enabled_title">Disabilita il backend del modulo del kernel</string>
+    <string name="module_disabler_disabled_summary">Il modulo sperimentale del kernel può migliorare le prestazioni</string>
+    <string name="module_disabler_disabled_title">Abilita il backend del modulo del kernel</string>
+    <string name="module_disabler_enabled_summary">Il backend in userspace più lento potrebbe migliorare la stabilità</string>
+    <string name="module_disabler_enabled_title">Disabilita il backend del modulo del kernel</string>
     <string name="module_installer_error">Qualcosa non ha funzionato. Riprova</string>
     <string name="module_installer_initial">Il modulo sperimentale del kernel può migliorare le prestazioni</string>
     <string name="module_installer_not_found">Nessun modulo disponibile per il tuo dispositivo</string>
diff --git a/ui/src/main/res/values-ja/strings.xml b/ui/src/main/res/values-ja/strings.xml
index e10a05a8..7aa5531a 100644
--- a/ui/src/main/res/values-ja/strings.xml
+++ b/ui/src/main/res/values-ja/strings.xml
@@ -129,10 +129,10 @@
     <string name="log_viewer_pref_title">アプリケーションログを表示</string>
     <string name="log_viewer_title">ログ</string>
     <string name="logcat_error">logcat を実行できません: </string>
-    <string name="module_enabler_disabled_summary">カーネルモジュールは実験的ですがパフォーマンスが向上する可能性があります。</string>
-    <string name="module_enabler_disabled_title">カーネルモジュールバックエンドの有効化</string>
-    <string name="module_enabler_enabled_summary">ユーザースペースバックエンドは低速ですが安定しています。</string>
-    <string name="module_enabler_enabled_title">カーネルモジュールバックエンドの無効化</string>
+    <string name="module_disabler_disabled_summary">カーネルモジュールは実験的ですがパフォーマンスが向上する可能性があります。</string>
+    <string name="module_disabler_disabled_title">カーネルモジュールバックエンドの有効化</string>
+    <string name="module_disabler_enabled_summary">ユーザースペースバックエンドは低速ですが安定しています。</string>
+    <string name="module_disabler_enabled_title">カーネルモジュールバックエンドの無効化</string>
     <string name="module_installer_error">失敗しました. 再度実行してみてください</string>
     <string name="module_installer_initial">実験的カーネルモジュールはパフォーマンスが向上する場合があります</string>
     <string name="module_installer_not_found">このデバイス用のモジュールは利用できません</string>
diff --git a/ui/src/main/res/values-ko-rKR/strings.xml b/ui/src/main/res/values-ko-rKR/strings.xml
index c975945a..a2890b26 100644
--- a/ui/src/main/res/values-ko-rKR/strings.xml
+++ b/ui/src/main/res/values-ko-rKR/strings.xml
@@ -129,10 +129,10 @@
     <string name="log_viewer_pref_title">앱 로그 보기</string>
     <string name="log_viewer_title">로그</string>
     <string name="logcat_error">logcat을 실행할 수 없음: </string>
-    <string name="module_enabler_disabled_summary">아직 실험중이 커널 모듈을 사용하면 성능이 향상될 수 있음</string>
-    <string name="module_enabler_disabled_title">커널 모듈 백엔드 활성화하기</string>
-    <string name="module_enabler_enabled_summary">사용자공간 백엔드를 사용하면 느리지만 안정성이 좋아짐</string>
-    <string name="module_enabler_enabled_title">커널 모듈 백엔드를 비활성화하기</string>
+    <string name="module_disabler_disabled_summary">아직 실험중이 커널 모듈을 사용하면 성능이 향상될 수 있음</string>
+    <string name="module_disabler_disabled_title">커널 모듈 백엔드 활성화하기</string>
+    <string name="module_disabler_enabled_summary">사용자공간 백엔드를 사용하면 느리지만 안정성이 좋아짐</string>
+    <string name="module_disabler_enabled_title">커널 모듈 백엔드를 비활성화하기</string>
     <string name="module_installer_error">문제가 발생했습니다. 다시 시도하십시오</string>
     <string name="module_installer_initial">아직 실험중이 커널 모듈을 사용하면 성능이 향상될 수 있음</string>
     <string name="module_installer_not_found">이 기기에서 사용가능한 모듈이 없음</string>
diff --git a/ui/src/main/res/values-no-rNO/strings.xml b/ui/src/main/res/values-no-rNO/strings.xml
index b0616f4e..f9c2c979 100644
--- a/ui/src/main/res/values-no-rNO/strings.xml
+++ b/ui/src/main/res/values-no-rNO/strings.xml
@@ -142,10 +142,10 @@
     <string name="log_viewer_pref_title">Vis programlogg</string>
     <string name="log_viewer_title">Logg</string>
     <string name="logcat_error">Kan ikke kjøre logcat: </string>
-    <string name="module_enabler_disabled_summary">Den eksperimentelle kjernemodulen kan gi bedre ytelse</string>
-    <string name="module_enabler_disabled_title">Aktiver backend for kjerne-modul</string>
-    <string name="module_enabler_enabled_summary">Backend i userspace er litt tregere men kan gi bedre stabilitet</string>
-    <string name="module_enabler_enabled_title">Deaktiver backend for kjerne-modul</string>
+    <string name="module_disabler_disabled_summary">Den eksperimentelle kjernemodulen kan gi bedre ytelse</string>
+    <string name="module_disabler_disabled_title">Aktiver backend for kjerne-modul</string>
+    <string name="module_disabler_enabled_summary">Backend i userspace er litt tregere men kan gi bedre stabilitet</string>
+    <string name="module_disabler_enabled_title">Deaktiver backend for kjerne-modul</string>
     <string name="module_installer_error">Noe gikk galt. Vennligst prøv igjen</string>
     <string name="module_installer_initial">Den eksperimentelle kjernemodulen kan gi bedre ytelse</string>
     <string name="module_installer_not_found">Ingen moduler er tilgjengelige for din enhet</string>
diff --git a/ui/src/main/res/values-pa-rIN/strings.xml b/ui/src/main/res/values-pa-rIN/strings.xml
index 1d7ac096..ed7e96ba 100644
--- a/ui/src/main/res/values-pa-rIN/strings.xml
+++ b/ui/src/main/res/values-pa-rIN/strings.xml
@@ -142,10 +142,10 @@
     <string name="log_viewer_pref_title">ਐਪਲੀਕੇਸ਼ਨ ਲਾਗ ਵੇਖੋ</string>
     <string name="log_viewer_title">ਲਾਗ</string>
     <string name="logcat_error">logcat ਚਲਾਉਣ ਲਈ ਅਸਮਰੱਥ: </string>
-    <string name="module_enabler_disabled_summary">ਤਜਰਬੇ ਅਧੀਨ ਕਰਨਲ ਮੋਡੀਊਲ ਕਾਰਗੁਜ਼ਾਰੀ ਸੁਧਾਰ ਸਕਦਾ ਹੈ</string>
-    <string name="module_enabler_disabled_title">ਕਰਨਲ ਮੋਡੀਊਲ ਬੈਕਐਂਡ ਸਮਰੱਥ ਕਰੋ</string>
-    <string name="module_enabler_enabled_summary">ਹੌਲੀ ਵਰਤੋਂਕਾਰ-ਸਪੇਸ ਬੈਂਕਡ ਸਥਿਰਤਾ ਸੁਧਾਰ ਕਰ ਸਕਦਾ ਹੈ</string>
-    <string name="module_enabler_enabled_title">ਕਰਨਲ ਮੋਡੀਊਲ ਬੈਕਐਂਡ ਅਸਮਰੱਥ ਕਰੋ</string>
+    <string name="module_disabler_disabled_summary">ਤਜਰਬੇ ਅਧੀਨ ਕਰਨਲ ਮੋਡੀਊਲ ਕਾਰਗੁਜ਼ਾਰੀ ਸੁਧਾਰ ਸਕਦਾ ਹੈ</string>
+    <string name="module_disabler_disabled_title">ਕਰਨਲ ਮੋਡੀਊਲ ਬੈਕਐਂਡ ਸਮਰੱਥ ਕਰੋ</string>
+    <string name="module_disabler_enabled_summary">ਹੌਲੀ ਵਰਤੋਂਕਾਰ-ਸਪੇਸ ਬੈਂਕਡ ਸਥਿਰਤਾ ਸੁਧਾਰ ਕਰ ਸਕਦਾ ਹੈ</string>
+    <string name="module_disabler_enabled_title">ਕਰਨਲ ਮੋਡੀਊਲ ਬੈਕਐਂਡ ਅਸਮਰੱਥ ਕਰੋ</string>
     <string name="module_installer_error">ਕੁਝ ਗਲਤ ਵਾਪਰ ਗਿਆ। ਮੁੜ ਕੋਸ਼ਿਸ਼ ਕਰੋ</string>
     <string name="module_installer_initial">ਤਜਰਬੇ ਅਧੀਨ ਕਰਨਲ ਮੋਡੀਊਲ ਕਾਰਗੁਜ਼ਾਰੀ ਸੁਧਾਰ ਸਕਦਾ ਹੈ</string>
     <string name="module_installer_not_found">ਤੁਹਾਡੇ ਡਿਵਾਈਸ ਲਈ ਕੋਈ ਮੋਡੀਊਲ ਮੌਜੂਦ ਨਹੀਂ ਹਨ</string>
diff --git a/ui/src/main/res/values-pl-rPL/strings.xml b/ui/src/main/res/values-pl-rPL/strings.xml
index 119bdc74..b739035e 100644
--- a/ui/src/main/res/values-pl-rPL/strings.xml
+++ b/ui/src/main/res/values-pl-rPL/strings.xml
@@ -168,10 +168,10 @@
     <string name="log_viewer_pref_title">Wyświetl log aplikacji</string>
     <string name="log_viewer_title">Log</string>
     <string name="logcat_error">Nie można uruchomić narzędzia logcat: </string>
-    <string name="module_enabler_disabled_summary">Eksperymentalny moduł jądra może poprawić wydajność</string>
-    <string name="module_enabler_disabled_title">Włącz moduł jądra</string>
-    <string name="module_enabler_enabled_summary">Wolniejsza implementacja w przestrzeni użytkownika może poprawić stabilność</string>
-    <string name="module_enabler_enabled_title">Wyłącz moduł jądra</string>
+    <string name="module_disabler_disabled_summary">Eksperymentalny moduł jądra może poprawić wydajność</string>
+    <string name="module_disabler_disabled_title">Włącz moduł jądra</string>
+    <string name="module_disabler_enabled_summary">Wolniejsza implementacja w przestrzeni użytkownika może poprawić stabilność</string>
+    <string name="module_disabler_enabled_title">Wyłącz moduł jądra</string>
     <string name="module_installer_error">Coś poszło nie tak. Proszę spróbować ponownie</string>
     <string name="module_installer_initial">Eksperymentalny moduł jądra może poprawić wydajność</string>
     <string name="module_installer_not_found">Brak dostępnych modułów dla tego urządzenia</string>
diff --git a/ui/src/main/res/values-pt-rPT/strings.xml b/ui/src/main/res/values-pt-rPT/strings.xml
index fc1f19cb..b609cf2b 100644
--- a/ui/src/main/res/values-pt-rPT/strings.xml
+++ b/ui/src/main/res/values-pt-rPT/strings.xml
@@ -142,10 +142,10 @@
     <string name="log_viewer_pref_title">Ver log da aplicação</string>
     <string name="log_viewer_title">Log</string>
     <string name="logcat_error">Não foi possível executar o logcat: </string>
-    <string name="module_enabler_disabled_summary">O módulo experimental de kernel pode melhorar o desempenho</string>
-    <string name="module_enabler_disabled_title">Habilitar módulo backend do kernel</string>
-    <string name="module_enabler_enabled_summary">O backend do userspace mais lento pode aumentar a estabilidade</string>
-    <string name="module_enabler_enabled_title">Desabilitar módulo backend do kernel</string>
+    <string name="module_disabler_disabled_summary">O módulo experimental de kernel pode melhorar o desempenho</string>
+    <string name="module_disabler_disabled_title">Habilitar módulo backend do kernel</string>
+    <string name="module_disabler_enabled_summary">O backend do userspace mais lento pode aumentar a estabilidade</string>
+    <string name="module_disabler_enabled_title">Desabilitar módulo backend do kernel</string>
     <string name="module_installer_error">Ocorreu um erro. Por favor, tente novamente</string>
     <string name="module_installer_initial">O módulo experimental do kernel pode melhorar o desempenho</string>
     <string name="module_installer_not_found">Não há módulos disponíveis para o seu dispositivo</string>
diff --git a/ui/src/main/res/values-ro-rRO/strings.xml b/ui/src/main/res/values-ro-rRO/strings.xml
index 5caa3cae..e0249364 100644
--- a/ui/src/main/res/values-ro-rRO/strings.xml
+++ b/ui/src/main/res/values-ro-rRO/strings.xml
@@ -155,10 +155,10 @@
     <string name="log_viewer_pref_title">Vizualizare jurnal aplicație</string>
     <string name="log_viewer_title">Jurnal</string>
     <string name="logcat_error">Programul logcat nu poate fi executat: </string>
-    <string name="module_enabler_disabled_summary">Modulul experimental de nucleu poate îmbunătăți performanța</string>
-    <string name="module_enabler_disabled_title">Activează biblioteca modulului de nucleu</string>
-    <string name="module_enabler_enabled_summary">Biblioteca mai lentă a spațiului utilizatorului poate îmbunătăți stabilitatea</string>
-    <string name="module_enabler_enabled_title">Dezactivează biblioteca modulului de nucleu</string>
+    <string name="module_disabler_disabled_summary">Modulul experimental de nucleu poate îmbunătăți performanța</string>
+    <string name="module_disabler_disabled_title">Activează biblioteca modulului de nucleu</string>
+    <string name="module_disabler_enabled_summary">Biblioteca mai lentă a spațiului utilizatorului poate îmbunătăți stabilitatea</string>
+    <string name="module_disabler_enabled_title">Dezactivează biblioteca modulului de nucleu</string>
     <string name="module_installer_error">A apărut o eroare. Încearcă din nou</string>
     <string name="module_installer_initial">Modulul experimental de nucleu poate îmbunătăți performanța</string>
     <string name="module_installer_not_found">Nu sunt disponibile module pentru dispozitivul tău</string>
diff --git a/ui/src/main/res/values-ru/strings.xml b/ui/src/main/res/values-ru/strings.xml
index b15436de..3fc6c911 100644
--- a/ui/src/main/res/values-ru/strings.xml
+++ b/ui/src/main/res/values-ru/strings.xml
@@ -168,10 +168,10 @@
     <string name="log_viewer_pref_title">Просмотр журналов приложения</string>
     <string name="log_viewer_title">Журнал</string>
     <string name="logcat_error">Не удалось запустить logcat: </string>
-    <string name="module_enabler_disabled_summary">Экспериментальный модуль ядра может улучшить производительность</string>
-    <string name="module_enabler_disabled_title">Включить бэкэнд модуля ядра</string>
-    <string name="module_enabler_enabled_summary">Пользовательское пространство немного медленнее и улучшает стабильность</string>
-    <string name="module_enabler_enabled_title">Отключить бэкэнд модуля ядра</string>
+    <string name="module_disabler_disabled_summary">Экспериментальный модуль ядра может улучшить производительность</string>
+    <string name="module_disabler_disabled_title">Включить бэкэнд модуля ядра</string>
+    <string name="module_disabler_enabled_summary">Пользовательское пространство немного медленнее и улучшает стабильность</string>
+    <string name="module_disabler_enabled_title">Отключить бэкэнд модуля ядра</string>
     <string name="module_installer_error">Что-то пошло не так. Пожалуйста, попробуйте еще раз</string>
     <string name="module_installer_initial">Экспериментальный модуль ядра может улучшить производительность</string>
     <string name="module_installer_not_found">Для вашего устройства нет доступных модулей</string>
diff --git a/ui/src/main/res/values-sk-rSK/strings.xml b/ui/src/main/res/values-sk-rSK/strings.xml
index 30ba9f98..3479091f 100644
--- a/ui/src/main/res/values-sk-rSK/strings.xml
+++ b/ui/src/main/res/values-sk-rSK/strings.xml
@@ -77,7 +77,7 @@
     <string name="log_saver_activity_label">Uložiť denník udalostí</string>
     <string name="log_viewer_pref_summary">Denník udalosti môžu byt nápomocné pri ladení aplikácie</string>
     <string name="log_viewer_pref_title">Zobraziť denník udalostí aplikácie</string>
-    <string name="module_enabler_enabled_summary">Pomalšie užívatelské prostredie môže zlepšiť stabilitu</string>
+    <string name="module_disabler_enabled_summary">Pomalšie užívatelské prostredie môže zlepšiť stabilitu</string>
     <string name="module_installer_error">Niečo sa pokazilo. Prosím, skúste znova</string>
     <string name="module_installer_not_found">Pre vaše zariadenie nie sú k dispozícii žiadne moduly</string>
     <string name="module_installer_title">Stiahni a nainštaluj kernel modul</string>
diff --git a/ui/src/main/res/values-sl/strings.xml b/ui/src/main/res/values-sl/strings.xml
index 8c98bc12..87b548e1 100644
--- a/ui/src/main/res/values-sl/strings.xml
+++ b/ui/src/main/res/values-sl/strings.xml
@@ -166,10 +166,10 @@
     <string name="log_viewer_pref_title">Prikaži dnevnik aplikacije</string>
     <string name="log_viewer_title">Dnevnik</string>
     <string name="logcat_error">Ukaza logcat ni bilo mogoče izvesti: </string>
-    <string name="module_enabler_disabled_summary">Eksperimentalni modul jedra lahko izboljša zmogljivost</string>
-    <string name="module_enabler_disabled_title">Omogoči zaledje za modul jedra</string>
-    <string name="module_enabler_enabled_summary">Počasnejše uporabniško zaledje lahko izboljša stabilnost</string>
-    <string name="module_enabler_enabled_title">Onemogoči zaledje za modul jedra</string>
+    <string name="module_disabler_disabled_summary">Eksperimentalni modul jedra lahko izboljša zmogljivost</string>
+    <string name="module_disabler_disabled_title">Omogoči zaledje za modul jedra</string>
+    <string name="module_disabler_enabled_summary">Počasnejše uporabniško zaledje lahko izboljša stabilnost</string>
+    <string name="module_disabler_enabled_title">Onemogoči zaledje za modul jedra</string>
     <string name="module_installer_error">Nekaj je šlo narobe, prosimo poskusite znova</string>
     <string name="module_installer_initial">Eksperimentalni modul jedra lahko izboljša zmogljivost</string>
     <string name="module_installer_not_found">Za vašo napravo ni razpoložljivih modulov</string>
diff --git a/ui/src/main/res/values-sv-rSE/strings.xml b/ui/src/main/res/values-sv-rSE/strings.xml
index 16765166..686bd338 100644
--- a/ui/src/main/res/values-sv-rSE/strings.xml
+++ b/ui/src/main/res/values-sv-rSE/strings.xml
@@ -114,10 +114,10 @@
     <string name="log_viewer_pref_title">Visa applikationslogg</string>
     <string name="log_viewer_title">Logg</string>
     <string name="logcat_error">Kunde inte köra logcat: </string>
-    <string name="module_enabler_disabled_summary">Den experimentella kärnmodulen kan förbättra prestanda</string>
-    <string name="module_enabler_disabled_title">Aktivera backend för kärnmodul</string>
-    <string name="module_enabler_enabled_summary">Den långsammare backend för användarrymden kan förbättra stabiliteten</string>
-    <string name="module_enabler_enabled_title">Inaktivera backend för kärnmodul</string>
+    <string name="module_disabler_disabled_summary">Den experimentella kärnmodulen kan förbättra prestanda</string>
+    <string name="module_disabler_disabled_title">Aktivera backend för kärnmodul</string>
+    <string name="module_disabler_enabled_summary">Den långsammare backend för användarrymden kan förbättra stabiliteten</string>
+    <string name="module_disabler_enabled_title">Inaktivera backend för kärnmodul</string>
     <string name="module_installer_error">Något gick fel. Vänligen försök igen</string>
     <string name="module_installer_initial">Den experimentella kärnmodulen kan förbättra prestanda</string>
     <string name="module_installer_not_found">Inga moduler finns tillgängliga för din enhet</string>
diff --git a/ui/src/main/res/values-tr-rTR/strings.xml b/ui/src/main/res/values-tr-rTR/strings.xml
index b05d395d..89642b86 100644
--- a/ui/src/main/res/values-tr-rTR/strings.xml
+++ b/ui/src/main/res/values-tr-rTR/strings.xml
@@ -142,10 +142,10 @@
     <string name="log_viewer_pref_title">Uygulama günlüğünü görüntüle</string>
     <string name="log_viewer_title">Günlük</string>
     <string name="logcat_error">Logcat çalıştırılamıyor: </string>
-    <string name="module_enabler_disabled_summary">Deneysel çekirdek modülü performansı artırabilir</string>
-    <string name="module_enabler_disabled_title">Çekirdek modülü arka ucunu etkinleştir</string>
-    <string name="module_enabler_enabled_summary">Daha yavaş kullanıcı alanı arka ucu kararlılığı artırabilir</string>
-    <string name="module_enabler_enabled_title">Çekirdek modülü arka ucunu devre dışı bırak</string>
+    <string name="module_disabler_disabled_summary">Deneysel çekirdek modülü performansı artırabilir</string>
+    <string name="module_disabler_disabled_title">Çekirdek modülü arka ucunu etkinleştir</string>
+    <string name="module_disabler_enabled_summary">Daha yavaş kullanıcı alanı arka ucu kararlılığı artırabilir</string>
+    <string name="module_disabler_enabled_title">Çekirdek modülü arka ucunu devre dışı bırak</string>
     <string name="module_installer_error">Bir şeyler yanlış gitti. Lütfen tekrar deneyin</string>
     <string name="module_installer_initial">Deneysel çekirdek modülü performansı artırabilir</string>
     <string name="module_installer_not_found">Cihazınız için uygun modül yok</string>
diff --git a/ui/src/main/res/values-uk-rUA/strings.xml b/ui/src/main/res/values-uk-rUA/strings.xml
index 4ecdb781..252595f0 100644
--- a/ui/src/main/res/values-uk-rUA/strings.xml
+++ b/ui/src/main/res/values-uk-rUA/strings.xml
@@ -168,10 +168,10 @@
     <string name="log_viewer_pref_title">Переглянути журнал програми</string>
     <string name="log_viewer_title">Журнал</string>
     <string name="logcat_error">Не вдалося запустити logcat: </string>
-    <string name="module_enabler_disabled_summary">Експериментальний модуль ядра може підвищити продуктивність</string>
-    <string name="module_enabler_disabled_title">Увімкнути модуль ядра</string>
-    <string name="module_enabler_enabled_summary">Користувацький простір повільніший, проте може покращити стабільність</string>
-    <string name="module_enabler_enabled_title">Вимкнути модуль ядра</string>
+    <string name="module_disabler_disabled_summary">Експериментальний модуль ядра може підвищити продуктивність</string>
+    <string name="module_disabler_disabled_title">Увімкнути модуль ядра</string>
+    <string name="module_disabler_enabled_summary">Користувацький простір повільніший, проте може покращити стабільність</string>
+    <string name="module_disabler_enabled_title">Вимкнути модуль ядра</string>
     <string name="module_installer_error">Щось пішло не так. Спробуйте ще раз</string>
     <string name="module_installer_initial">Експериментальний модуль ядра може підвищити продуктивність</string>
     <string name="module_installer_not_found">Немає доступних модулів для вашого пристрою</string>
diff --git a/ui/src/main/res/values-vi-rVN/strings.xml b/ui/src/main/res/values-vi-rVN/strings.xml
new file mode 100644
index 00000000..582a81aa
--- /dev/null
+++ b/ui/src/main/res/values-vi-rVN/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="all_applications">Tất cả các ứng dụng</string>
+    <string name="exclude_from_tunnel">Ngoại trừ</string>
+</resources>
diff --git a/ui/src/main/res/values-zh-rCN/strings.xml b/ui/src/main/res/values-zh-rCN/strings.xml
index 60e84c7e..24c5b6c3 100644
--- a/ui/src/main/res/values-zh-rCN/strings.xml
+++ b/ui/src/main/res/values-zh-rCN/strings.xml
@@ -129,10 +129,10 @@
     <string name="log_viewer_pref_title">查看应用日志</string>
     <string name="log_viewer_title">日志</string>
     <string name="logcat_error">无法运行 logcat： </string>
-    <string name="module_enabler_disabled_summary">内核空间的模块性能较强，但可能不稳定</string>
-    <string name="module_enabler_disabled_title">启用内核模块</string>
-    <string name="module_enabler_enabled_summary">用户空间的模块性能较弱，但稳定性更好</string>
-    <string name="module_enabler_enabled_title">停用内核模块</string>
+    <string name="module_disabler_disabled_summary">内核空间的模块性能较强，但可能不稳定</string>
+    <string name="module_disabler_disabled_title">启用内核模块</string>
+    <string name="module_disabler_enabled_summary">用户空间的模块性能较弱，但稳定性更好</string>
+    <string name="module_disabler_enabled_title">停用内核模块</string>
     <string name="module_installer_error">发生错误，请重试</string>
     <string name="module_installer_initial">使用内核模块可以提升性能（实验性）</string>
     <string name="module_installer_not_found">没有可用于此设备的模块</string>
diff --git a/ui/src/main/res/values-zh-rTW/strings.xml b/ui/src/main/res/values-zh-rTW/strings.xml
index f4150e2c..2f58e445 100644
--- a/ui/src/main/res/values-zh-rTW/strings.xml
+++ b/ui/src/main/res/values-zh-rTW/strings.xml
@@ -129,8 +129,8 @@
     <string name="log_viewer_pref_title">檢視應用程式日誌</string>
     <string name="log_viewer_title">日誌</string>
     <string name="logcat_error">無法執行 logcat: </string>
-    <string name="module_enabler_disabled_summary">使用還在實驗階段的 kernel module 以便改善效能</string>
-    <string name="module_enabler_disabled_title">啟用 kernel module</string>
+    <string name="module_disabler_disabled_summary">使用還在實驗階段的 kernel module 以便改善效能</string>
+    <string name="module_disabler_disabled_title">啟用 kernel module</string>
     <string name="save">儲存</string>
     <string name="select_all">全選</string>
     <string name="toggle_all">切換全部</string>
-- 
cgit v1.2.3


From d1237e2718de2daea5db4f1a95b4978b6311b795 Mon Sep 17 00:00:00 2001
From: "L.W.Reek" <syphyr@gmail.com>
Date: Sun, 29 Jan 2023 02:56:24 +0100
Subject: build: Google Play requires target API level 31 or higher

Fix build failure from lint check

Signed-off-by: L.W.Reek <syphyr@gmail.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 ui/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/build.gradle b/ui/build.gradle
index 94bbf786..a5e7b4fa 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -22,7 +22,7 @@ android {
     defaultConfig {
         applicationId 'com.wireguard.android'
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode wireguardVersionCode
         versionName wireguardVersionName
         buildConfigField 'int', 'MIN_SDK_VERSION', "$minSdkVersion.apiLevel"
-- 
cgit v1.2.3


From 296295ab8afe1fcf8c3653ecee601a2d312949b5 Mon Sep 17 00:00:00 2001
From: "L.W.Reek" <syphyr@gmail.com>
Date: Wed, 7 Dec 2022 22:24:45 +0100
Subject: gradle: use same NDK for tunnel and UI

Fixes: 4f261560 ("gradle: force the use of an older NDK version")
Signed-off-by: L.W.Reek <syphyr@gmail.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 ui/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/build.gradle b/ui/build.gradle
index a5e7b4fa..67f2a5c3 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -13,6 +13,7 @@ final def keystorePropertiesFile = rootProject.file("keystore.properties")
 
 android {
     compileSdk 33
+    ndkVersion "21.4.7075529"
     buildFeatures {
         buildConfig = true
         dataBinding = true
-- 
cgit v1.2.3


From 62986b5cadbfbee99d6edaf434fba0cd80b77a10 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Tue, 21 Mar 2023 15:43:06 +0100
Subject: version: bump

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 version.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.gradle b/version.gradle
index 6137523a..807f6cd6 100644
--- a/version.gradle
+++ b/version.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        wireguardVersionCode = 492
-        wireguardVersionName = '1.0.20220516'
+        wireguardVersionCode = 493
+        wireguardVersionName = '1.0.20230321'
     }
 }
-- 
cgit v1.2.3


From 4d00c334b18bdf59ddd6d9eb99f52de98390ac44 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Wed, 22 Mar 2023 13:57:41 +0100
Subject: ui: set button text after loading app list in AppListDialogFragment

Otherwise, for lots of apps, the dialog shows before they're enumerated,
and the button text never gets set.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt
index 6f1c5418..e137a8b4 100644
--- a/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt
+++ b/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt
@@ -60,6 +60,7 @@ class AppListDialogFragment : DialogFragment() {
                     appData.clear()
                     appData.addAll(applicationData)
                 }
+                setButtonText()
             } catch (e: Throwable) {
                 withContext(Dispatchers.Main.immediate) {
                     val error = ErrorMessages[e]
-- 
cgit v1.2.3


From 4aa4843b7431344d81e1e7c7713a20e1834b0e46 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Wed, 22 Mar 2023 14:26:39 +0100
Subject: tools: use __ANDROID_MIN_SDK_VERSION__ instead of __ANDROID_API__

The latter is deprecated.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 tunnel/tools/ndk-compat/compat.c | 4 ++--
 tunnel/tools/ndk-compat/compat.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tunnel/tools/ndk-compat/compat.c b/tunnel/tools/ndk-compat/compat.c
index a610da4c..2c54c086 100644
--- a/tunnel/tools/ndk-compat/compat.c
+++ b/tunnel/tools/ndk-compat/compat.c
@@ -6,7 +6,7 @@
 
 #define FILE_IS_EMPTY
 
-#if defined(__ANDROID_API__) && __ANDROID_API__ < 18
+#if defined(__ANDROID_MIN_SDK_VERSION__) && __ANDROID_MIN_SDK_VERSION__ < 18
 #undef FILE_IS_EMPTY
 #include <stdio.h>
 #include <stdlib.h>
@@ -58,7 +58,7 @@ ssize_t getline(char **buf, size_t *bufsiz, FILE *fp)
 }
 #endif
 
-#if defined(__ANDROID_API__) && __ANDROID_API__ < 24
+#if defined(__ANDROID_MIN_SDK_VERSION__) && __ANDROID_MIN_SDK_VERSION__ < 24
 #undef FILE_IS_EMPTY
 #include <string.h>
 
diff --git a/tunnel/tools/ndk-compat/compat.h b/tunnel/tools/ndk-compat/compat.h
index 73cce668..32f6d799 100644
--- a/tunnel/tools/ndk-compat/compat.h
+++ b/tunnel/tools/ndk-compat/compat.h
@@ -4,13 +4,13 @@
  *
  */
 
-#if defined(__ANDROID_API__) && __ANDROID_API__ < 18
+#if defined(__ANDROID_MIN_SDK_VERSION__) && __ANDROID_MIN_SDK_VERSION__ < 18
 #include <stdio.h>
 ssize_t getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp);
 ssize_t getline(char **buf, size_t *bufsiz, FILE *fp);
 #endif
 
-#if defined(__ANDROID_API__) && __ANDROID_API__ < 24
+#if defined(__ANDROID_MIN_SDK_VERSION__) && __ANDROID_MIN_SDK_VERSION__ < 24
 char *strchrnul(const char *s, int c);
 #endif
 
-- 
cgit v1.2.3


From 3ab1f94514bae96bde387435cea72472e3782b56 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Tue, 21 Mar 2023 16:51:18 +0100
Subject: tools: compile with latest NDK

The -mthumb -> -marm hack is unfortunate.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 tunnel/build.gradle            |  1 -
 tunnel/tools/CMakeLists.txt    | 14 +++++---------
 tunnel/tools/libwg-go/Makefile |  5 ++---
 ui/build.gradle                |  1 -
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/tunnel/build.gradle b/tunnel/build.gradle
index da15770b..a297bfa1 100644
--- a/tunnel/build.gradle
+++ b/tunnel/build.gradle
@@ -7,7 +7,6 @@ group groupName
 
 android {
     compileSdk 33
-    ndkVersion '21.4.7075529'
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
diff --git a/tunnel/tools/CMakeLists.txt b/tunnel/tools/CMakeLists.txt
index 4ab5f831..76191ca4 100644
--- a/tunnel/tools/CMakeLists.txt
+++ b/tunnel/tools/CMakeLists.txt
@@ -6,9 +6,6 @@ cmake_minimum_required(VERSION 3.4.1)
 project("WireGuard")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
 
-# Work around https://github.com/android-ndk/ndk/issues/602
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold")
-
 add_executable(libwg-quick.so wireguard-tools/src/wg-quick/android.c ndk-compat/compat.c)
 target_compile_options(libwg-quick.so PUBLIC -O3 -std=gnu11 -Wall -include ${CMAKE_CURRENT_SOURCE_DIR}/ndk-compat/compat.h -DWG_PACKAGE_NAME=\"${ANDROID_PACKAGE_NAME}\")
 target_link_libraries(libwg-quick.so -ldl)
@@ -20,14 +17,13 @@ target_compile_options(libwg.so PUBLIC -O3 -std=gnu11 -D_GNU_SOURCE -include ${C
 
 add_custom_target(libwg-go.so WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/libwg-go" COMMENT "Building wireguard-go" VERBATIM COMMAND make
     ANDROID_ARCH_NAME=${ANDROID_ARCH_NAME}
-    ANDROID_C_COMPILER=${ANDROID_C_COMPILER}
-    ANDROID_TOOLCHAIN_ROOT=${ANDROID_TOOLCHAIN_ROOT}
-    ANDROID_LLVM_TRIPLE=${ANDROID_LLVM_TRIPLE}
-    ANDROID_SYSROOT=${ANDROID_SYSROOT}
     ANDROID_PACKAGE_NAME=${ANDROID_PACKAGE_NAME}
     GRADLE_USER_HOME=${GRADLE_USER_HOME}
-    CFLAGS=${CMAKE_C_FLAGS}\ -Wno-unused-command-line-argument
-    LDFLAGS=${CMAKE_SHARED_LINKER_FLAGS}\ -fuse-ld=gold
+    CC=${CMAKE_C_COMPILER}
+    CFLAGS=${CMAKE_C_FLAGS}
+    LDFLAGS=${CMAKE_SHARED_LINKER_FLAGS}
+    SYSROOT=${CMAKE_SYSROOT}
+    TARGET=${CMAKE_C_COMPILER_TARGET}
     DESTDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
     BUILDDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/../generated-src
 )
diff --git a/tunnel/tools/libwg-go/Makefile b/tunnel/tools/libwg-go/Makefile
index e8cf5815..10c695e4 100644
--- a/tunnel/tools/libwg-go/Makefile
+++ b/tunnel/tools/libwg-go/Makefile
@@ -12,10 +12,9 @@ NDK_GO_ARCH_MAP_arm64 := arm64
 NDK_GO_ARCH_MAP_mips := mipsx
 NDK_GO_ARCH_MAP_mips64 := mips64x
 
-CLANG_FLAGS := --target=$(ANDROID_LLVM_TRIPLE) --gcc-toolchain=$(ANDROID_TOOLCHAIN_ROOT) --sysroot=$(ANDROID_SYSROOT)
-export CGO_CFLAGS := $(CLANG_FLAGS) $(CFLAGS)
+CLANG_FLAGS := --target=$(TARGET) --sysroot=$(SYSROOT)
+export CGO_CFLAGS := $(CLANG_FLAGS) $(subst -mthumb,-marm,$(CFLAGS))
 export CGO_LDFLAGS := $(CLANG_FLAGS) $(LDFLAGS) -Wl,-soname=libwg-go.so
-export CC := $(ANDROID_C_COMPILER)
 export GOARCH := $(NDK_GO_ARCH_MAP_$(ANDROID_ARCH_NAME))
 export GOOS := android
 export CGO_ENABLED := 1
diff --git a/ui/build.gradle b/ui/build.gradle
index 67f2a5c3..a5e7b4fa 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -13,7 +13,6 @@ final def keystorePropertiesFile = rootProject.file("keystore.properties")
 
 android {
     compileSdk 33
-    ndkVersion "21.4.7075529"
     buildFeatures {
         buildConfig = true
         dataBinding = true
-- 
cgit v1.2.3


From e843fccbc6a4a61c6473e48bca7b9c1fa46c334b Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Wed, 22 Mar 2023 11:50:18 +0530
Subject: gradle: bump wrapper version

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 build.gradle                             |   4 ++--
 gradle/wrapper/gradle-wrapper.jar        | Bin 60756 -> 61608 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 gradlew                                  |   4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4fe2dcda..46d94a33 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,8 +29,8 @@ task clean(type: Delete) {
 
 tasks {
     wrapper {
-        gradleVersion = "7.6"
-        distributionSha256Sum = "7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b"
+        gradleVersion = "8.0.2"
+        distributionSha256Sum = "ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7"
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 249e5832..ccebba77 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index adb6acbd..19acfb4e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionSha256Sum=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 65dcd68d..79a61d42 100755
--- a/gradlew
+++ b/gradlew
@@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
-- 
cgit v1.2.3


From 052ff060b18491d178a68336a68b4f2b959d2de2 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Wed, 22 Mar 2023 21:27:50 +0530
Subject: gradle: use idiomatic task handling

- The hand-rolled clean task is not required

- Tasks should use configureEach to prevent eager evaluation

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 build.gradle    |  4 ----
 ui/build.gradle | 10 +++++-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 46d94a33..448162f0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,10 +23,6 @@ buildscript {
     }
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
-
 tasks {
     wrapper {
         gradleVersion = "8.0.2"
diff --git a/ui/build.gradle b/ui/build.gradle
index a5e7b4fa..2c2a3fa8 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
@@ -82,13 +84,11 @@ dependencies {
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$desugarVersion"
 }
 
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
     options.compilerArgs << '-Xlint:unchecked'
     options.deprecation = true
 }
 
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
-    }
+tasks.withType(KotlinCompile).configureEach {
+    kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8
 }
-- 
cgit v1.2.3


From 94e6d99dc76517f51c171a55a6e3a71a5f06490b Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Wed, 22 Mar 2023 21:33:36 +0530
Subject: gradle: upgrade AndroidX libraries

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 448162f0..e2182246 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,8 +1,8 @@
 buildscript {
     ext {
         activityVersion = '1.6.1'
-        annotationsVersion = '1.5.0'
-        appcompatVersion = '1.5.1'
+        annotationsVersion = '1.6.0'
+        appcompatVersion = '1.6.1'
         biometricVersion = '1.1.0'
         collectionVersion = '1.2.0'
         constraintLayoutVersion = '2.1.4'
@@ -11,11 +11,11 @@ buildscript {
         coroutinesVersion = '1.6.4'
         datastoreVersion = '1.0.0'
         desugarVersion = '1.1.5'
-        fragmentVersion = '1.5.4'
+        fragmentVersion = '1.5.5'
         jsr305Version = '3.0.2'
         junitVersion = '4.13.2'
-        lifecycleRuntimeKtxVersion = '2.5.1'
-        materialComponentsVersion = '1.7.0'
+        lifecycleRuntimeKtxVersion = '2.6.0'
+        materialComponentsVersion = '1.8.0'
         preferenceVersion = '1.2.0'
         zxingEmbeddedVersion = '4.3.0'
 
-- 
cgit v1.2.3


From 91227e445a9411059aac5062fc863b1fcb5dcb60 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Wed, 22 Mar 2023 21:17:18 +0530
Subject: ui: address PackageManager API deprecations

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 .../wireguard/android/fragment/AppListDialogFragment.kt   | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt
index e137a8b4..627a9728 100644
--- a/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt
+++ b/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt
@@ -6,6 +6,10 @@ package com.wireguard.android.fragment
 
 import android.Manifest
 import android.app.Dialog
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import android.content.pm.PackageManager.PackageInfoFlags
+import android.os.Build
 import android.os.Bundle
 import android.widget.Button
 import android.widget.Toast
@@ -41,7 +45,7 @@ class AppListDialogFragment : DialogFragment() {
             try {
                 val applicationData: MutableList<ApplicationData> = ArrayList()
                 withContext(Dispatchers.IO) {
-                    val packageInfos = pm.getPackagesHoldingPermissions(arrayOf(Manifest.permission.INTERNET), 0)
+                    val packageInfos = getPackagesHoldingPermissions(pm, arrayOf(Manifest.permission.INTERNET))
                     packageInfos.forEach {
                         val packageName = it.packageName
                         val appInfo = it.applicationInfo
@@ -78,6 +82,15 @@ class AppListDialogFragment : DialogFragment() {
         initiallyExcluded = arguments?.getBoolean(KEY_IS_EXCLUDED) ?: true
     }
 
+    private fun getPackagesHoldingPermissions(pm: PackageManager, permissions: Array<String>): List<PackageInfo> {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            pm.getPackagesHoldingPermissions(permissions, PackageInfoFlags.of(0L))
+        } else {
+            @Suppress("DEPRECATION")
+            pm.getPackagesHoldingPermissions(permissions, 0)
+        }
+    }
+
     private fun setButtonText() {
         val numSelected = appData.count { it.isSelected }
         button?.text = if (numSelected == 0)
-- 
cgit v1.2.3


From 35c8c10b7e006c85f4fa20b1870fadb36107bade Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Wed, 22 Mar 2023 21:17:50 +0530
Subject: ui: address Parcelable API deprecations

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 .../java/com/wireguard/android/fragment/TunnelEditorFragment.kt   | 8 +++++++-
 ui/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.kt   | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt
index 872d0eab..315a6b86 100644
--- a/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt
+++ b/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt
@@ -5,6 +5,7 @@
 package com.wireguard.android.fragment
 
 import android.content.Context
+import android.os.Build
 import android.os.Bundle
 import android.text.InputType
 import android.util.Log
@@ -265,7 +266,12 @@ class TunnelEditorFragment : BaseFragment() {
             onSelectedTunnelChanged(null, selectedTunnel)
         } else {
             tunnel = selectedTunnel
-            val config: ConfigProxy = savedInstanceState.getParcelable(KEY_LOCAL_CONFIG)!!
+            val config: ConfigProxy = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                savedInstanceState.getParcelable(KEY_LOCAL_CONFIG, ConfigProxy::class.java)!!
+            } else {
+                @Suppress("DEPRECATION")
+                savedInstanceState.getParcelable(KEY_LOCAL_CONFIG)!!
+            }
             val originalName = savedInstanceState.getString(KEY_ORIGINAL_NAME)
             if (tunnel != null && tunnel!!.name != originalName) onSelectedTunnelChanged(null, tunnel) else binding!!.config = config
         }
diff --git a/ui/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.kt b/ui/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.kt
index 0e3c9aa1..e29de2dd 100644
--- a/ui/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.kt
+++ b/ui/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.kt
@@ -18,7 +18,7 @@ class ConfigProxy : Parcelable {
     val peers: ObservableList<PeerProxy> = ObservableArrayList()
 
     private constructor(parcel: Parcel) {
-        `interface` = parcel.readParcelable(InterfaceProxy::class.java.classLoader)!!
+        `interface` = InterfaceProxy.CREATOR.createFromParcel(parcel)
         parcel.readTypedList(peers, PeerProxy.CREATOR)
         peers.forEach { it.bind(this) }
     }
-- 
cgit v1.2.3


From b44380c81a17efc6ed52c0ca65b3adf2cac5637e Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Wed, 22 Mar 2023 21:18:49 +0530
Subject: ui: migrate to MenuProvider

AndroidX Activity 1.4.0 introduced the new lifecycle-dependent MenuProvider
APIs that supersede existing onCreateOptionsMenu-style menus.

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 .../android/fragment/TunnelDetailFragment.kt         | 19 +++++++++++++------
 .../android/fragment/TunnelEditorFragment.kt         | 20 +++++++++++++-------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.kt
index 7a76edbe..8b155e24 100644
--- a/ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.kt
+++ b/ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.kt
@@ -8,9 +8,12 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
+import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.MenuProvider
 import androidx.databinding.DataBindingUtil
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import com.wireguard.android.R
 import com.wireguard.android.backend.Tunnel
@@ -24,18 +27,17 @@ import kotlinx.coroutines.launch
 /**
  * Fragment that shows details about a specific tunnel.
  */
-class TunnelDetailFragment : BaseFragment() {
+class TunnelDetailFragment : BaseFragment(), MenuProvider {
     private var binding: TunnelDetailFragmentBinding? = null
     private var lastState = Tunnel.State.TOGGLE
     private var timerActive = true
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setHasOptionsMenu(true)
+    override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
+        return false
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        inflater.inflate(R.menu.tunnel_detail, menu)
+    override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+        menuInflater.inflate(R.menu.tunnel_detail, menu)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
@@ -46,6 +48,11 @@ class TunnelDetailFragment : BaseFragment() {
         return binding?.root
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        requireActivity().addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.RESUMED)
+    }
+
     override fun onDestroyView() {
         binding = null
         super.onDestroyView()
diff --git a/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt
index 315a6b86..c4c031fa 100644
--- a/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt
+++ b/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt
@@ -19,6 +19,8 @@ import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
 import android.widget.Toast
+import androidx.core.view.MenuProvider
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.snackbar.Snackbar
 import com.wireguard.android.Application
@@ -36,7 +38,7 @@ import kotlinx.coroutines.launch
 /**
  * Fragment for editing a WireGuard configuration.
  */
-class TunnelEditorFragment : BaseFragment() {
+class TunnelEditorFragment : BaseFragment(), MenuProvider {
     private var haveShownKeys = false
     private var binding: TunnelEditorFragmentBinding? = null
     private var tunnel: ObservableTunnel? = null
@@ -66,11 +68,10 @@ class TunnelEditorFragment : BaseFragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setHasOptionsMenu(true)
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        inflater.inflate(R.menu.config_editor, menu)
+    override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+        menuInflater.inflate(R.menu.config_editor, menu)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
@@ -84,6 +85,11 @@ class TunnelEditorFragment : BaseFragment() {
         return binding?.root
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        requireActivity().addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.RESUMED)
+    }
+
     override fun onDestroyView() {
         activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
         binding = null
@@ -106,8 +112,8 @@ class TunnelEditorFragment : BaseFragment() {
             selectedTunnel = tunnel
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        if (item.itemId == R.id.menu_action_save) {
+    override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
+        if (menuItem.itemId == R.id.menu_action_save) {
             binding ?: return false
             val newConfig = try {
                 binding!!.config!!.resolve()
@@ -153,7 +159,7 @@ class TunnelEditorFragment : BaseFragment() {
             }
             return true
         }
-        return super.onOptionsItemSelected(item)
+        return false
     }
 
     @Suppress("UNUSED_PARAMETER")
-- 
cgit v1.2.3


From 0fb78ba6fc16b00d0b375e49b2368be937745072 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Thu, 23 Mar 2023 13:43:35 +0100
Subject: ui: bring back donation button

For Google Play Store builds, we'll display an alert box. This was
inspired by the discussion around StreetComplete; hopefully we'll have a
similar okay outcome.

Link: https://github.com/streetcomplete/streetcomplete/issues/3768
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 ui/build.gradle                                    |  3 ++
 .../android/preference/DonatePreference.kt         | 38 ++++++++++++++++++++++
 ui/src/main/res/values/strings.xml                 |  3 ++
 ui/src/main/res/xml/preferences.xml                |  2 ++
 4 files changed, 46 insertions(+)
 create mode 100644 ui/src/main/java/com/wireguard/android/preference/DonatePreference.kt

diff --git a/ui/build.gradle b/ui/build.gradle
index 2c2a3fa8..656ab28e 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -48,6 +48,9 @@ android {
         }
     }
     buildTypes {
+        all {
+            buildConfigField("boolean", "IS_GOOGLE_PLAY", (System.getenv("WG_BUILD_FOR_GOOGLE_PLAY") == "true").toString())
+        }
         release {
             if (keystorePropertiesFile.exists()) signingConfig signingConfigs.release
             minifyEnabled true
diff --git a/ui/src/main/java/com/wireguard/android/preference/DonatePreference.kt b/ui/src/main/java/com/wireguard/android/preference/DonatePreference.kt
new file mode 100644
index 00000000..57202c81
--- /dev/null
+++ b/ui/src/main/java/com/wireguard/android/preference/DonatePreference.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.android.preference
+
+import android.app.AlertDialog
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.util.AttributeSet
+import androidx.preference.Preference
+import com.wireguard.android.BuildConfig
+import com.wireguard.android.R
+
+class DonatePreference(context: Context, attrs: AttributeSet?) : Preference(context, attrs) {
+    override fun getSummary() = context.getString(R.string.donate_summary)
+
+    override fun getTitle() = context.getString(R.string.donate_title)
+
+    override fun onClick() {
+        if (BuildConfig.IS_GOOGLE_PLAY) {
+            AlertDialog.Builder(context)
+                .setTitle(R.string.donate_title)
+                .setMessage(R.string.donate_google_play_disappointment)
+                .show()
+            return
+        }
+        val intent = Intent(Intent.ACTION_VIEW)
+        intent.data = Uri.parse("https://www.wireguard.com/donations/")
+        try {
+            context.startActivity(intent)
+        } catch (ignored: ActivityNotFoundException) {
+        }
+    }
+}
\ No newline at end of file
diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml
index 6c090199..ef2573eb 100644
--- a/ui/src/main/res/values/strings.xml
+++ b/ui/src/main/res/values/strings.xml
@@ -108,6 +108,9 @@
     <string name="tv_select_a_storage_drive">Select a storage drive</string>
     <string name="tv_no_file_picker">Please install a file management utility to browse files</string>
     <string name="tv_add_tunnel_get_started">Add a tunnel to get started</string>
+    <string name="donate_title">♥ Donate to the WireGuard Project</string>
+    <string name="donate_summary">Every contribution helps</string>
+    <string name="donate_google_play_disappointment">Thank you for supporting the WireGuard Project!\n\nUnfortunately, due to Google\'s policies, we\'re not allowed to link to the part of the project webpage where you can make a donation. Hopefully you can figure this out!\n\nThanks again for your contribution.</string>
     <string name="disable_config_export_title">Disable config exporting</string>
     <string name="disable_config_export_description">Disabling config exporting makes private keys less accessible</string>
     <string name="dns_servers">DNS servers</string>
diff --git a/ui/src/main/res/xml/preferences.xml b/ui/src/main/res/xml/preferences.xml
index 5c9505d4..aa89f27c 100644
--- a/ui/src/main/res/xml/preferences.xml
+++ b/ui/src/main/res/xml/preferences.xml
@@ -40,4 +40,6 @@
         android:summaryOff="@string/allow_remote_control_intents_summary_off"
         android:summaryOn="@string/allow_remote_control_intents_summary_on"
         android:title="@string/allow_remote_control_intents_title" />
+    <com.wireguard.android.preference.DonatePreference
+        android:singleLineTitle="false" />
 </androidx.preference.PreferenceScreen>
-- 
cgit v1.2.3


From be9695a0c101e2e582bea9535be3c94ea43a0c6c Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Thu, 23 Mar 2023 14:31:19 +0100
Subject: ui: simplify IME displaying in ConfigNamingDialogFragment

Also cleanup some event listener flow.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 .../android/fragment/ConfigNamingDialogFragment.kt | 48 +++-------------------
 .../res/layout/config_naming_dialog_fragment.xml   |  5 ++-
 2 files changed, 8 insertions(+), 45 deletions(-)

diff --git a/ui/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.kt
index df6908b1..97f2ec73 100644
--- a/ui/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.kt
+++ b/ui/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.kt
@@ -5,15 +5,11 @@
 package com.wireguard.android.fragment
 
 import android.app.Dialog
-import android.content.DialogInterface
 import android.os.Bundle
-import android.view.inputmethod.InputMethodManager
-import androidx.appcompat.app.AlertDialog
-import androidx.core.content.getSystemService
+import android.view.WindowManager
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.textfield.TextInputEditText
 import com.wireguard.android.Application
 import com.wireguard.android.R
 import com.wireguard.android.databinding.ConfigNamingDialogFragmentBinding
@@ -27,7 +23,6 @@ import java.nio.charset.StandardCharsets
 class ConfigNamingDialogFragment : DialogFragment() {
     private var binding: ConfigNamingDialogFragmentBinding? = null
     private var config: Config? = null
-    private var imm: InputMethodManager? = null
 
     private fun createTunnelAndDismiss() {
         val binding = binding ?: return
@@ -42,12 +37,6 @@ class ConfigNamingDialogFragment : DialogFragment() {
             }
         }
     }
-
-    override fun dismiss() {
-        setKeyboardVisible(false)
-        super.dismiss()
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val configText = requireArguments().getString(KEY_CONFIG_TEXT)
@@ -64,7 +53,6 @@ class ConfigNamingDialogFragment : DialogFragment() {
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val activity = requireActivity()
-        imm = activity.getSystemService()
         val alertDialogBuilder = MaterialAlertDialogBuilder(activity)
         alertDialogBuilder.setTitle(R.string.import_from_qr_code)
         binding = ConfigNamingDialogFragmentBinding.inflate(activity.layoutInflater, null, false)
@@ -72,37 +60,11 @@ class ConfigNamingDialogFragment : DialogFragment() {
             executePendingBindings()
             alertDialogBuilder.setView(root)
         }
-        alertDialogBuilder.setPositiveButton(R.string.create_tunnel, null)
+        alertDialogBuilder.setPositiveButton(R.string.create_tunnel) { _, _ -> createTunnelAndDismiss() }
         alertDialogBuilder.setNegativeButton(R.string.cancel) { _, _ -> dismiss() }
-        return alertDialogBuilder.create().apply {
-            setOnShowListener {
-                findViewById<TextInputEditText>(R.id.tunnel_name_text)?.apply {
-                    setOnFocusChangeListener { v, _ ->
-                        v.post {
-                            imm?.showSoftInput(v, InputMethodManager.SHOW_IMPLICIT)
-                        }
-                    }
-                    requestFocus()
-                }
-            }
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        val dialog = dialog as AlertDialog?
-        if (dialog != null) {
-            dialog.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener { createTunnelAndDismiss() }
-            setKeyboardVisible(true)
-        }
-    }
-
-    private fun setKeyboardVisible(visible: Boolean) {
-        if (visible) {
-            imm!!.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0)
-        } else if (binding != null) {
-            imm!!.hideSoftInputFromWindow(binding!!.tunnelNameText.windowToken, 0)
-        }
+        val dialog = alertDialogBuilder.create()
+        dialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
+        return dialog
     }
 
     companion object {
diff --git a/ui/src/main/res/layout/config_naming_dialog_fragment.xml b/ui/src/main/res/layout/config_naming_dialog_fragment.xml
index 0fd88c6c..88deb976 100644
--- a/ui/src/main/res/layout/config_naming_dialog_fragment.xml
+++ b/ui/src/main/res/layout/config_naming_dialog_fragment.xml
@@ -3,7 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
-
         <import type="com.wireguard.android.widget.NameInputFilter" />
     </data>
 
@@ -24,7 +23,9 @@
                 android:hint="@string/tunnel_name"
                 android:imeOptions="actionDone"
                 android:inputType="textNoSuggestions|textVisiblePassword"
-                app:filter="@{NameInputFilter.newInstance()}" />
+                app:filter="@{NameInputFilter.newInstance()}">
+                <requestFocus/>
+            </com.google.android.material.textfield.TextInputEditText>
 
         </com.google.android.material.textfield.TextInputLayout>
 
-- 
cgit v1.2.3


From f1cb4c2164f03d126cc67714b580696e24fca9ed Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Thu, 23 Mar 2023 15:01:09 +0100
Subject: ui: switch from using launchWhenCreated to using repeatOnLifecycle

Apparently the former is deprecated.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 ui/src/main/java/com/wireguard/android/activity/BaseActivity.kt | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ui/src/main/java/com/wireguard/android/activity/BaseActivity.kt b/ui/src/main/java/com/wireguard/android/activity/BaseActivity.kt
index 6c85be57..204a5a80 100644
--- a/ui/src/main/java/com/wireguard/android/activity/BaseActivity.kt
+++ b/ui/src/main/java/com/wireguard/android/activity/BaseActivity.kt
@@ -7,9 +7,12 @@ package com.wireguard.android.activity
 import android.os.Bundle
 import androidx.databinding.CallbackRegistry
 import androidx.databinding.CallbackRegistry.NotifierCallback
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import com.wireguard.android.Application
 import com.wireguard.android.model.ObservableTunnel
+import kotlinx.coroutines.launch
 
 /**
  * Base class for activities that need to remember the currently-selected tunnel.
@@ -37,7 +40,11 @@ abstract class BaseActivity : ThemeChangeAwareActivity() {
             else -> null
         }
         if (savedTunnelName != null)
-            lifecycleScope.launchWhenCreated { selectedTunnel = Application.getTunnelManager().getTunnels()[savedTunnelName] }
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    selectedTunnel = Application.getTunnelManager().getTunnels()[savedTunnelName]
+                }
+            }
 
         // The selected tunnel must be set before the superclass method recreates fragments.
         super.onCreate(savedInstanceState)
-- 
cgit v1.2.3


From d764b040cadec023f0c1b43b268c45407579cd71 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Thu, 23 Mar 2023 15:15:15 +0100
Subject: ui: set selected tunnel after creating fragments

I'm not sure why that comment (Samuel's) was there saying it was
necessary. Given it's been async for a long while, this wasn't
guaranteed anyway. So let's get rid of it and see what happens. Screen
rotation seems fine thus far.

Cc: Samuel Holland <samuel@sholland.org>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 .../main/java/com/wireguard/android/activity/BaseActivity.kt  | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/ui/src/main/java/com/wireguard/android/activity/BaseActivity.kt b/ui/src/main/java/com/wireguard/android/activity/BaseActivity.kt
index 204a5a80..8f0855ea 100644
--- a/ui/src/main/java/com/wireguard/android/activity/BaseActivity.kt
+++ b/ui/src/main/java/com/wireguard/android/activity/BaseActivity.kt
@@ -7,9 +7,7 @@ package com.wireguard.android.activity
 import android.os.Bundle
 import androidx.databinding.CallbackRegistry
 import androidx.databinding.CallbackRegistry.NotifierCallback
-import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import com.wireguard.android.Application
 import com.wireguard.android.model.ObservableTunnel
 import kotlinx.coroutines.launch
@@ -33,6 +31,8 @@ abstract class BaseActivity : ThemeChangeAwareActivity() {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
         // Restore the saved tunnel if there is one; otherwise grab it from the arguments.
         val savedTunnelName = when {
             savedInstanceState != null -> savedInstanceState.getString(KEY_SELECTED_TUNNEL)
@@ -41,13 +41,8 @@ abstract class BaseActivity : ThemeChangeAwareActivity() {
         }
         if (savedTunnelName != null)
             lifecycleScope.launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    selectedTunnel = Application.getTunnelManager().getTunnels()[savedTunnelName]
-                }
+                selectedTunnel = Application.getTunnelManager().getTunnels()[savedTunnelName]
             }
-
-        // The selected tunnel must be set before the superclass method recreates fragments.
-        super.onCreate(savedInstanceState)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
-- 
cgit v1.2.3


From 140f9ebb2fa061a106ace04118a48f1a3678d26b Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Wed, 22 Mar 2023 21:24:33 +0530
Subject: build: raise target SDK to 33

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 tunnel/build.gradle | 2 +-
 ui/build.gradle     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tunnel/build.gradle b/tunnel/build.gradle
index a297bfa1..54ef4d91 100644
--- a/tunnel/build.gradle
+++ b/tunnel/build.gradle
@@ -14,7 +14,7 @@ android {
     namespace 'com.wireguard.android.tunnel'
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode wireguardVersionCode
         versionName wireguardVersionName
     }
diff --git a/ui/build.gradle b/ui/build.gradle
index 656ab28e..bbe94ef5 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -24,7 +24,7 @@ android {
     defaultConfig {
         applicationId 'com.wireguard.android'
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode wireguardVersionCode
         versionName wireguardVersionName
         buildConfigField 'int', 'MIN_SDK_VERSION', "$minSdkVersion.apiLevel"
-- 
cgit v1.2.3


From 46ec3315b502680f3e30758b0849b5f3a143c9c6 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Thu, 23 Mar 2023 15:45:01 +0100
Subject: ui: migrate to OnBackPressedDispatcher

This is compatible with Android 13's prediction-based back gesture
animation.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 ui/src/main/AndroidManifest.xml                     |  1 +
 .../com/wireguard/android/activity/MainActivity.kt  | 21 +++++++++++++--------
 .../wireguard/android/activity/TvMainActivity.kt    | 16 ++++++++++++++--
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/ui/src/main/AndroidManifest.xml b/ui/src/main/AndroidManifest.xml
index f1daac30..a7538a6e 100644
--- a/ui/src/main/AndroidManifest.xml
+++ b/ui/src/main/AndroidManifest.xml
@@ -35,6 +35,7 @@
         android:name=".Application"
         android:allowBackup="false"
         android:banner="@mipmap/banner"
+        android:enableOnBackInvokedCallback="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
diff --git a/ui/src/main/java/com/wireguard/android/activity/MainActivity.kt b/ui/src/main/java/com/wireguard/android/activity/MainActivity.kt
index 2276e873..1566c129 100644
--- a/ui/src/main/java/com/wireguard/android/activity/MainActivity.kt
+++ b/ui/src/main/java/com/wireguard/android/activity/MainActivity.kt
@@ -9,6 +9,8 @@ import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import androidx.activity.OnBackPressedCallback
+import androidx.activity.addCallback
 import androidx.appcompat.app.ActionBar
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentTransaction
@@ -26,27 +28,29 @@ import com.wireguard.android.model.ObservableTunnel
 class MainActivity : BaseActivity(), FragmentManager.OnBackStackChangedListener {
     private var actionBar: ActionBar? = null
     private var isTwoPaneLayout = false
+    private var backPressedCallback: OnBackPressedCallback? = null
 
-    override fun onBackPressed() {
+    private fun handleBackPressed() {
         val backStackEntries = supportFragmentManager.backStackEntryCount
         // If the two-pane layout does not have an editor open, going back should exit the app.
         if (isTwoPaneLayout && backStackEntries <= 1) {
             finish()
             return
         }
-        // Deselect the current tunnel on navigating back from the detail pane to the one-pane list.
-        if (!isTwoPaneLayout && backStackEntries == 1) {
+
+        if (backStackEntries >= 1)
             supportFragmentManager.popBackStack()
+
+        // Deselect the current tunnel on navigating back from the detail pane to the one-pane list.
+        if (backStackEntries == 1)
             selectedTunnel = null
-            return
-        }
-        super.onBackPressed()
     }
 
     override fun onBackStackChanged() {
+        val backStackEntries = supportFragmentManager.backStackEntryCount
+        backPressedCallback?.isEnabled = backStackEntries >= 1
         if (actionBar == null) return
         // Do not show the home menu when the two-pane layout is at the detail view (see above).
-        val backStackEntries = supportFragmentManager.backStackEntryCount
         val minBackStackEntries = if (isTwoPaneLayout) 2 else 1
         actionBar!!.setDisplayHomeAsUpEnabled(backStackEntries >= minBackStackEntries)
     }
@@ -57,6 +61,7 @@ class MainActivity : BaseActivity(), FragmentManager.OnBackStackChangedListener
         actionBar = supportActionBar
         isTwoPaneLayout = findViewById<View?>(R.id.master_detail_wrapper) != null
         supportFragmentManager.addOnBackStackChangedListener(this)
+        backPressedCallback = onBackPressedDispatcher.addCallback(this) { handleBackPressed() }
         onBackStackChanged()
     }
 
@@ -69,7 +74,7 @@ class MainActivity : BaseActivity(), FragmentManager.OnBackStackChangedListener
         return when (item.itemId) {
             android.R.id.home -> {
                 // The back arrow in the action bar should act the same as the back button.
-                onBackPressed()
+                onBackPressedDispatcher.onBackPressed()
                 true
             }
             R.id.menu_action_edit -> {
diff --git a/ui/src/main/java/com/wireguard/android/activity/TvMainActivity.kt b/ui/src/main/java/com/wireguard/android/activity/TvMainActivity.kt
index a0903793..ae98f442 100644
--- a/ui/src/main/java/com/wireguard/android/activity/TvMainActivity.kt
+++ b/ui/src/main/java/com/wireguard/android/activity/TvMainActivity.kt
@@ -16,12 +16,14 @@ import android.os.storage.StorageVolume
 import android.util.Log
 import android.view.View
 import android.widget.Toast
+import androidx.activity.addCallback
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.content.getSystemService
 import androidx.core.view.forEach
 import androidx.databinding.DataBindingUtil
+import androidx.databinding.Observable
 import androidx.databinding.ObservableBoolean
 import androidx.databinding.ObservableField
 import androidx.lifecycle.lifecycleScope
@@ -185,6 +187,17 @@ class TvMainActivity : AppCompatActivity() {
                 binding.tunnelList.requestFocus()
             }
         }
+
+        val backPressedCallback = onBackPressedDispatcher.addCallback(this) { handleBackPressed() }
+        val updateBackPressedCallback = object : Observable.OnPropertyChangedCallback() {
+            override fun onPropertyChanged(sender: Observable?, propertyId: Int) {
+                backPressedCallback.isEnabled = isDeleting.get() || filesRoot.get()?.isNotEmpty() == true
+            }
+        }
+        isDeleting.addOnPropertyChangedCallback(updateBackPressedCallback)
+        filesRoot.addOnPropertyChangedCallback(updateBackPressedCallback)
+        backPressedCallback.isEnabled = false
+
         binding.executePendingBindings()
         setContentView(binding.root)
 
@@ -298,7 +311,7 @@ class TvMainActivity : AppCompatActivity() {
         }
     }
 
-    override fun onBackPressed() {
+    private fun handleBackPressed() {
         when {
             isDeleting.get() -> {
                 isDeleting.set(false)
@@ -313,7 +326,6 @@ class TvMainActivity : AppCompatActivity() {
                     binding.tunnelList.requestFocus()
                 }
             }
-            else -> super.onBackPressed()
         }
     }
 
-- 
cgit v1.2.3