version: bump

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

README.md

@@ -12,6 +12,8 @@ $ cd wireguard-android
 $ ./gradlew assembleRelease
 ```
 
+macOS users may need [flock(1)](https://github.com/discoteq/flock).
+
 ## Embedding
 
 The tunnel library is [on JCenter](https://bintray.com/wireguard/wireguard-android/wireguard-android/_latestVersion), alongside [extensive class library documentation](https://javadoc.io/doc/com.wireguard.android/tunnel).

build.gradle

@@ -1,3 +1,4 @@
+
 allprojects {
     repositories {
         google()
@@ -7,7 +8,7 @@ allprojects {
 
 buildscript {
     ext {
-        agpVersion = '3.6.1'
+        agpVersion = '3.6.2'
         annotationsVersion = '1.1.0'
         appcompatVersion = '1.1.0'
         bintrayPluginVersion = '1.8.4'
@@ -19,7 +20,7 @@ buildscript {
         coreKtxVersion = '1.2.0'
         coroutinesVersion = '1.3.5'
         eddsaVersion = '0.3.0'
-        fragmentVersion = '1.2.3'
+        fragmentVersion = '1.2.4'
         jsr305Version = '3.0.2'
         junitVersion = '4.13'
         kotlinVersion = '1.3.71'

tunnel/tools/libwg-go/Makefile

@@ -14,7 +14,7 @@ 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)
-export CGO_LDFLAGS := $(CLANG_FLAGS) $(LDFLAGS)
+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
@@ -30,7 +30,7 @@ default: $(DESTDIR)/libwg-go.so
 
 $(GRADLE_USER_HOME)/caches/golang/$(GO_TARBALL):
 	mkdir -p "$(dir $@)"
-	flock -x "$@.lock" -c ' \
+	flock "$@.lock" -c ' \
 	[ -f "$@" ] && exit 0; \
 	curl -o "$@.tmp" "https://dl.google.com/go/$(GO_TARBALL)" && \
 	echo "$(GO_HASH_$(GO_PLATFORM))  $@.tmp" | sha256sum -c && \
@@ -38,7 +38,7 @@ $(GRADLE_USER_HOME)/caches/golang/$(GO_TARBALL):
 
 $(BUILDDIR)/go-$(GO_VERSION)/.prepared: $(GRADLE_USER_HOME)/caches/golang/$(GO_TARBALL)
 	mkdir -p "$(dir $@)"
-	flock -x "$@.lock" -c ' \
+	flock "$@.lock" -c ' \
 	[ -f "$@" ] && exit 0; \
 	tar -C "$(dir $@)" --strip-components=1 -xzf "$^" && \
 	patch -p1 -f -N -r- -d "$(dir $@)" < goruntime-boottime-over-monotonic.diff && \

ui/build.gradle

@@ -59,6 +59,9 @@ android {
             versionNameSuffix "-debug"
         }
     }
+    lintOptions {
+        disable('LongLogTag')
+    }
 }
 
 dependencies {

ui/proguard-rules.pro

@@ -4,3 +4,11 @@
 
 # Retain some information to keep stacktraces usable
 -keepattributes SourceFile,LineNumberTable
+
+# Fragment 1.2.4 allows Fragment classes to be obfuscated but
+# databinding references in XML seem to not be rewritten to
+# match, so we preserve the names as 1.2.3 did.
+-if public class ** extends androidx.fragment.app.Fragment
+-keep public class <1> {
+    public <init>();
+}

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

@@ -235,6 +235,7 @@ class TunnelEditorFragment : BaseFragment(), AppExclusionListener {
     fun onKeyFocusChange(view: View, isFocused: Boolean) {
         if (!isFocused || showingAuthenticator) return
         val edit = view as? EditText ?: return
+        if (edit.inputType == InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS or InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) return
         if (!haveShownKeys && edit.text.isNotEmpty()) {
             showingAuthenticator = true
             BiometricAuthenticator.authenticate(R.string.biometric_prompt_private_key_title, this) {

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

@@ -24,7 +24,8 @@ class ObservableTunnel internal constructor(
         config: Config?,
         state: Tunnel.State
 ) : BaseObservable(), Keyed<String>, Tunnel {
-    override val key = name
+    override val key
+        get() = name
 
     @Bindable
     override fun getName() = name

version.gradle

@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        wireguardVersionCode = 470
-        wireguardVersionName = '1.0.20200329'
+        wireguardVersionCode = 472
+        wireguardVersionName = '1.0.20200401'
     }
 }