version: bump

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

.gitignore

@@ -14,5 +14,5 @@ build/
 *.dex
 *.iml
 *.jks
-keystore.properties
 gradlew.bat
+maint/

build.gradle

@@ -1,20 +1,20 @@
 buildscript {
     ext {
-        activityVersion = '1.6.1'
+        activityVersion = '1.7.0'
         annotationsVersion = '1.6.0'
         appcompatVersion = '1.6.1'
         biometricVersion = '1.1.0'
         collectionVersion = '1.2.0'
         constraintLayoutVersion = '2.1.4'
         coordinatorLayoutVersion = '1.2.0'
-        coreKtxVersion = '1.10.0-rc01'
+        coreKtxVersion = '1.10.0'
         coroutinesVersion = '1.6.4'
         datastoreVersion = '1.0.0'
         desugarVersion = '1.1.5'
-        fragmentVersion = '1.5.5'
+        fragmentVersion = '1.5.6'
         jsr305Version = '3.0.2'
         junitVersion = '4.13.2'
-        lifecycleRuntimeKtxVersion = '2.6.0'
+        lifecycleRuntimeKtxVersion = '2.6.1'
         materialComponentsVersion = '1.8.0'
         preferenceVersion = '1.2.0'
         zxingEmbeddedVersion = '4.3.0'

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

@@ -324,6 +324,9 @@ public final class GoBackend implements Backend {
             currentTunnelHandle = -1;
             currentConfig = null;
             wgTurnOff(handleToClose);
+            try {
+                vpnService.get(0, TimeUnit.NANOSECONDS).stopSelf();
+            } catch (final TimeoutException ignored) { }
         }
 
         tunnel.onStateChange(state);

tunnel/tools/CMakeLists.txt

@@ -6,15 +6,16 @@ cmake_minimum_required(VERSION 3.4.1)
 project("WireGuard")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
 add_link_options(LINKER:--build-id=none)
+add_compile_options(-Wall -Werror)
 
 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_compile_options(libwg-quick.so PUBLIC -std=gnu11 -include ${CMAKE_CURRENT_SOURCE_DIR}/ndk-compat/compat.h -DWG_PACKAGE_NAME=\"${ANDROID_PACKAGE_NAME}\")
 target_link_libraries(libwg-quick.so -ldl)
 
 file(GLOB WG_SOURCES wireguard-tools/src/*.c ndk-compat/compat.c)
 add_executable(libwg.so ${WG_SOURCES})
 target_include_directories(libwg.so PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/wireguard-tools/src/uapi/linux/" "${CMAKE_CURRENT_SOURCE_DIR}/wireguard-tools/src/")
-target_compile_options(libwg.so PUBLIC -O3 -std=gnu11 -D_GNU_SOURCE -include ${CMAKE_CURRENT_SOURCE_DIR}/ndk-compat/compat.h -DHAVE_VISIBILITY_HIDDEN -DRUNSTATEDIR=\"/data/data/${ANDROID_PACKAGE_NAME}/cache\")
+target_compile_options(libwg.so PUBLIC -std=gnu11 -include ${CMAKE_CURRENT_SOURCE_DIR}/ndk-compat/compat.h -DRUNSTATEDIR=\"/data/data/${ANDROID_PACKAGE_NAME}/cache\")
 
 add_custom_target(libwg-go.so WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/libwg-go" COMMENT "Building wireguard-go" VERBATIM COMMAND "${ANDROID_HOST_PREBUILTS}/bin/make"
     ANDROID_ARCH_NAME=${ANDROID_ARCH_NAME}

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.20.2
+GO_VERSION := 1.20.3
 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 := c93b8ced9517d07e1cd4c362c6e2d5242cb139e29b417a328fbf19aded08764c
-GO_HASH_darwin-arm64 := 7343c87f19e79c0063532e82e1c4d6f42175a32d99f7a4d15e658e88bf97f885
-GO_HASH_linux-amd64 := 4eaea32f59cde4dc635fbc42161031d13e1c780b87097f4b4234cfce671f1768
+GO_HASH_darwin-amd64 := c1e1161d6d859deb576e6cfabeb40e3d042ceb1c6f444f617c3c9d76269c3565
+GO_HASH_darwin-arm64 := 86b0ed0f2b2df50fa8036eea875d1cf2d76cefdacf247c44639a1464b7e36b95
+GO_HASH_linux-amd64 := 979694c2c25c735755bf26f4f45e19e64e4811d661dd07b8c010f7a8e18adfca
 
 default: $(DESTDIR)/libwg-go.so
 
@@ -47,6 +47,6 @@ $(BUILDDIR)/go-$(GO_VERSION)/.prepared: $(GRADLE_USER_HOME)/caches/golang/$(GO_T
 
 $(DESTDIR)/libwg-go.so: export PATH := $(BUILDDIR)/go-$(GO_VERSION)/bin/:$(PATH)
 $(DESTDIR)/libwg-go.so: $(BUILDDIR)/go-$(GO_VERSION)/.prepared go.mod
-	go build -tags linux -ldflags="-X golang.zx2c4.com/wireguard/ipc.socketDirectory=/data/data/$(ANDROID_PACKAGE_NAME)/cache/wireguard -buildid=" -v -trimpath -o "$@" -buildmode c-shared
+	go build -tags linux -ldflags="-X golang.zx2c4.com/wireguard/ipc.socketDirectory=/data/data/$(ANDROID_PACKAGE_NAME)/cache/wireguard -buildid=" -v -trimpath -buildvcs=false -o "$@" -buildmode c-shared
 
 .DELETE_ON_ERROR:

ui/build.gradle

@@ -9,10 +9,6 @@ plugins {
 version wireguardVersionName
 group groupName
 
-// Create a variable called keystorePropertiesFile, and initialize it to your
-// keystore.properties file, in the rootProject folder.
-final def keystorePropertiesFile = rootProject.file("keystore.properties")
-
 android {
     compileSdk 33
     buildFeatures {
@@ -34,23 +30,10 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
         coreLibraryDesugaringEnabled = true
     }
-    if (keystorePropertiesFile.exists()) {
-        final def keystoreProperties = new Properties()
-        keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-
-        signingConfigs {
-            release {
-                keyAlias keystoreProperties['keyAlias']
-                keyPassword keystoreProperties['keyPassword']
-                storeFile rootProject.file(keystoreProperties['storeFile'])
-                storePassword keystoreProperties['storePassword']
-            }
-        }
-    }
     buildTypes {
         release {
-            if (keystorePropertiesFile.exists()) signingConfig signingConfigs.release
             minifyEnabled true
+            shrinkResources true
             proguardFiles "proguard-android-optimize.txt", "proguard-rules.pro"
             packagingOptions {
                 exclude "DebugProbesKt.bin"

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

@@ -58,10 +58,6 @@ class Application : android.app.Application() {
             startActivity(intent)
             System.exit(0)
         }
-        if (BuildConfig.DEBUG) {
-            StrictMode.setVmPolicy(VmPolicy.Builder().detectAll().penaltyLog().build())
-            StrictMode.setThreadPolicy(ThreadPolicy.Builder().detectAll().penaltyLog().build())
-        }
     }
 
     private suspend fun determineBackend(): Backend {
@@ -119,6 +115,11 @@ class Application : android.app.Application() {
                 Log.e(TAG, Log.getStackTraceString(e))
             }
         }
+
+        if (BuildConfig.DEBUG) {
+            StrictMode.setVmPolicy(VmPolicy.Builder().detectAll().penaltyLog().build())
+            StrictMode.setThreadPolicy(ThreadPolicy.Builder().detectAll().penaltyLog().build())
+        }
     }
 
     override fun onTerminate() {

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

@@ -158,7 +158,6 @@ class LogViewerActivity : AppCompatActivity() {
             builder.append('\n')
         }
         val ret = builder.toString().toByteArray(Charsets.UTF_8)
-        builder.clear()
         return ret
     }
 
@@ -203,7 +202,7 @@ class LogViewerActivity : AppCompatActivity() {
             var priorModified = false
             val bufferedLogLines = arrayListOf<LogLine>()
             var timeout = 1000000000L / 2 // The timeout is initially small so that the view gets populated immediately.
-            val MAX_LINES = (1 shl 17) - 1
+            val MAX_LINES = (1 shl 16) - 1
             val MAX_BUFFERED_LINES = (1 shl 14) - 1
 
             while (true) {

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

@@ -63,8 +63,8 @@ class AppListDialogFragment : DialogFragment() {
                 withContext(Dispatchers.Main.immediate) {
                     appData.clear()
                     appData.addAll(applicationData)
+                    setButtonText()
                 }
-                setButtonText()
             } catch (e: Throwable) {
                 withContext(Dispatchers.Main.immediate) {
                     val error = ErrorMessages[e]

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

@@ -92,8 +92,8 @@ object ErrorMessages {
             rootCause is ChecksumException -> {
                 resources.getString(R.string.error_qr_checksum)
             }
-            rootCause.message != null -> {
-                rootCause.message!!
+            rootCause.localizedMessage != null -> {
+                rootCause.localizedMessage!!
             }
             else -> {
                 val errorType = rootCause.javaClass.simpleName
@@ -109,7 +109,7 @@ object ErrorMessages {
             if (kfe!!.type == KeyFormatException.Type.LENGTH) return resources.getString(KFE_FORMAT_MAP.getValue(kfe.format))
         } else if (bce.cause is ParseException) {
             val pe = bce.cause as ParseException?
-            if (pe!!.message != null) return ": ${pe.message}"
+            if (pe!!.localizedMessage != null) return ": ${pe.localizedMessage}"
         } else if (bce.location == BadConfigException.Location.LISTEN_PORT) {
             return resources.getString(R.string.bad_config_explanation_udp_port)
         } else if (bce.location == BadConfigException.Location.MTU) {

version.gradle

@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        wireguardVersionCode = 498
-        wireguardVersionName = '1.0.20230405'
+        wireguardVersionCode = 499
+        wireguardVersionName = '1.0.20230412'
     }
 }