Version bump

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
TunnelList: Get focus to toggle button via remote for Fire TV
2026-07-03 14:05:13 +02:00 · 2019-06-05 21:08:47 +02:00 · 2019-06-05 21:07:50 +02:00 · 2019-06-05 21:07:50 +02:00 · 2019-03-19 00:56:13 -06:00 · 2019-03-19 00:53:14 -06:00
8 changed files with 26 additions and 22 deletions
@@ -17,8 +17,8 @@ android {
        applicationId 'com.wireguard.android'
        minSdkVersion 21
        targetSdkVersion 28
-        versionCode 448
-        versionName '0.0.20190307'
+        versionCode 450
+        versionName '0.0.20190605'
        buildConfigField 'int', 'MIN_SDK_VERSION', "$minSdkVersion.apiLevel"
    }
    // If the keystore file exists
@@ -128,6 +128,6 @@ public final class WgQuickBackend implements Backend {
        // noinspection ResultOfMethodCallIgnored
        tempFile.delete();
        if (result != 0)
-            throw new Exception(context.getString(R.string.tunnel_config_error));
+            throw new Exception(context.getString(R.string.tunnel_config_error, result));
    }
 }
@@ -26,7 +26,7 @@ import java9.util.Optional;
 * Instances of this class are externally immutable.
 */
 public final class InetEndpoint {
-    private static final Pattern BARE_IPV6 = Pattern.compile("^[^\\[]*:");
+    private static final Pattern BARE_IPV6 = Pattern.compile("^[^\\[\\]]*:[^\\[\\]]*");
    private static final Pattern FORBIDDEN_CHARACTERS = Pattern.compile("[/?#]");

    private final String host;
@@ -26,10 +26,13 @@
    </data>

    <com.wireguard.android.widget.MultiselectableRelativeLayout
+        android:id="@+id/tunnel_list_item"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:background="@drawable/list_item_background"
-        android:descendantFocusability="blocksDescendants"
+        android:descendantFocusability="beforeDescendants"
+        android:focusable="true"
+        android:nextFocusRight="@+id/tunnel_switch"
        android:padding="16dp">

        <TextView
@@ -49,6 +52,7 @@
            android:layout_height="wrap_content"
            android:layout_alignBaseline="@+id/tunnel_name"
            android:layout_alignParentEnd="true"
+            android:nextFocusLeft="@+id/tunnel_list_item"
            app:checked="@{item.state == State.UP}"
            app:onBeforeCheckedChanged="@{fragment::setTunnelState}" />
    </com.wireguard.android.widget.MultiselectableRelativeLayout>
@@ -123,8 +123,8 @@
    <string name="set_exclusions">Set Exclusions</string>
    <string name="settings">Settings</string>
    <string name="shell_exit_status_read_error">Shell cannot read exit status</string>
-    <string name="shell_marker_count_error">Shell expected 4 markers, received %i</string>
-    <string name="shell_start_error">Shell failed to start: %i</string>
+    <string name="shell_marker_count_error">Shell expected 4 markers, received %d</string>
+    <string name="shell_start_error">Shell failed to start: %d</string>
    <string name="toggle_error">Error toggling WireGuard tunnel: %s</string>
    <string name="tools_installer_already">wg and wg-quick are already installed</string>
    <string name="tools_installer_failure">Unable to install command-line tools (no root?)</string>
@@ -137,14 +137,14 @@
    <string name="tools_installer_working">Installing wg and wg-quick</string>
    <string name="tools_unavailable_error">Required tools unavailable</string>
    <string name="tun_create_error">Unable to create tun device</string>
-    <string name="tunnel_config_error">Unable to configure tunnel (wg-quick returned %i)</string>
+    <string name="tunnel_config_error">Unable to configure tunnel (wg-quick returned %d)</string>
    <string name="tunnel_create_error">Unable to create tunnel: %s</string>
    <string name="tunnel_create_success">Successfully created tunnel “%s”</string>
    <string name="tunnel_error_already_exists">Tunnel “%s” already exists</string>
    <string name="tunnel_error_invalid_name">Invalid name</string>
    <string name="tunnel_list_placeholder">Add a tunnel using the blue button</string>
    <string name="tunnel_name">Tunnel Name</string>
-    <string name="tunnel_on_error">Unable to turn tunnel on (wgTurnOn returned %i)</string>
+    <string name="tunnel_on_error">Unable to turn tunnel on (wgTurnOn returned %d)</string>
    <string name="tunnel_rename_error">Unable to rename tunnel: %s</string>
    <string name="tunnel_rename_success">Successfully renamed tunnel to “%s”</string>
    <string name="type_name_go_userspace">Go userspace</string>
@@ -24,7 +24,7 @@ default: $(DESTDIR)/libwg-go.so

 GOBUILDARCH := $(NDK_GO_ARCH_MAP_$(shell uname -m))
 GOBUILDOS := $(shell uname -s | tr '[:upper:]' '[:lower:]')
-GOBUILDVERSION := 1.12
+GOBUILDVERSION := 1.12.5
 GOBUILDTARBALL := https://dl.google.com/go/go$(GOBUILDVERSION).$(GOBUILDOS)-$(GOBUILDARCH).tar.gz
 GOBUILDVERSION_NEEDED := go version go$(GOBUILDVERSION) $(GOBUILDOS)/$(GOBUILDARCH)
 export GOROOT := $(BUILDDIR)/goroot
@@ -3,6 +3,6 @@ module golang.zx2c4.com/wireguard/android
 go 1.12

 require (
-	golang.org/x/sys v0.0.0-20190307162637-572b51eaf722
-	golang.zx2c4.com/wireguard v0.0.0-20190308004054-5c7cc256e39a
+	golang.org/x/sys v0.0.0-20190522044717-8097e1b27ff5
+	golang.zx2c4.com/wireguard v0.0.20190518-0.20190605110920-108c37a05639
 )
@@ -1,11 +1,11 @@
-github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
-golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25 h1:jsG6UpNLt9iAsb0S2AGW28DveNzzgmbXR+ENoPjUeIU=
-golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/net v0.0.0-20190301231341-16b79f2e4e95 h1:fY7Dsw114eJN4boqzVSbpVHO6rTdhq6/GnXeu+PKnzU=
-golang.org/x/net v0.0.0-20190301231341-16b79f2e4e95/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190302025703-b6889370fb10/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190307162637-572b51eaf722 h1:LSRNeQHux7ghsicM4qcfeKMS/jqCsp0fqd4Y2UJL6eA=
-golang.org/x/sys v0.0.0-20190307162637-572b51eaf722/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.zx2c4.com/wireguard v0.0.0-20190308004054-5c7cc256e39a h1:RvrH0NQcXaN9h2JoBDAI3BWcTTJL3vH9L1gHQY0T76w=
-golang.zx2c4.com/wireguard v0.0.0-20190308004054-5c7cc256e39a/go.mod h1:Koyxt99ZAZcr8lJuisBNX9vnaqKVNGcITeWOI1Zkmsw=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190516110030-61b9204099cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190522044717-8097e1b27ff5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.zx2c4.com/wireguard v0.0.20190518-0.20190605110920-108c37a05639 h1:AoX5+g0OBk+KqTTMVl4YPFZ9ioU2tPW1YwtzaVWdORA=
+golang.zx2c4.com/wireguard v0.0.20190518-0.20190605110920-108c37a05639/go.mod h1:8X7vp4RrsvM83bde6vQ94DsL4ZpjUViVUym8aa8zGhs=
Author	SHA1	Message	Date
Jason A. Donenfeld	96d77988d3	Version bump Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2019-06-05 21:08:47 +02:00
Revath S Kumar	e9e4fd4e8b	TunnelList: Get focus to toggle button via remote for Fire TV This removes a no-longer-needed workaround for the ListView OnItemClickListener (it won't fire if a focusable view is inside the item view). Since converting our ListView instances to RecyclerView instances, we set the OnClick and OnLongClick listeners directly on the item view, and this workaround no longer has any effect. Unsurprisingly, the workaround breaks focusability of the Switch, which is necessary to toggle tunnels on devices with keypad-based navigation, such as the Fire TV. This commit also adds explicit focusability hints for the Switch. Related mail thread: https://lists.zx2c4.com/pipermail/wireguard/2019-May/004112.html Reported-by: Christophe-Marie Duquesne <chmd@chmd.fr> Reported-by: Revath S Kumar <gmail@revathskumar.com> [Samuel: sorted attributes; expanded commit message] Signed-off-by: Samuel Holland <samuel@sholland.org>	2019-06-05 21:07:50 +02:00
Jason A. Donenfeld	b5d9fbf1f4	libwg-go: bump Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2019-06-05 21:07:50 +02:00
Jason A. Donenfeld	81dc89f85b	Version bump Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2019-03-19 00:56:13 -06:00
Jason A. Donenfeld	76305045db	InetEndpoint: properly match IPv6 addresses The old one didn't account for trailing digits. Reported-by: Brandon Jackson <bjackson@napshome.net> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2019-03-19 00:53:14 -06:00
Jason A. Donenfeld	c4ba48d7a9	libwg-go: bump Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2019-03-19 00:40:45 -06:00
Jason A. Donenfeld	d5dcdf13bf	strings: %i is invalid Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2019-03-19 00:30:53 -06:00
Jason A. Donenfeld	7feb3dccbf	WgQuickBackend: pass result to error string Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2019-03-16 12:24:28 -06:00