WIP compilation fixes

4 files changed, 4 insertions, 5 deletions

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 45cd73e5..ef3a4fd3 100644
--- a/tunnel/src/main/java/com/wireguard/android/backend/Backend.java
+++ b/tunnel/src/main/java/com/wireguard/android/backend/Backend.java
@@ -27,7 +27,7 @@ public interface Backend {
      * @param config The new configuration for this tunnel.
      * @return The updated configuration of the tunnel.
      */
-    Config applyUserspaceConfig(ObservableTunnel tunnel, Config config) throws Exception;
+    Config applyUserspaceConfig(Tunnel tunnel, Config config) throws Exception;
 
     /**
      * Enumerate names of currently-running tunnels.
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 21c449b9..2564dcf9 100644
--- a/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java
+++ b/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java
@@ -92,7 +92,7 @@ public final class GoBackend implements Backend {
      * @return A set of string values denoting names of running tunnels.
      */
     @Override
-    public Config applyUserspaceConfig(final ObservableTunnel tunnel, final Config config) throws Exception {
+    public Config applyUserspaceConfig(final Tunnel tunnel, final Config config) throws Exception {
         if (currentTunnelHandle != -1) {
             // Build config
             final String goConfig = config.toWgUserspaceString();
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 f07a662c..11632530 100644
--- a/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
+++ b/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
@@ -58,7 +58,7 @@ public final class WgQuickBackend implements Backend {
     }
 
     @Override
-    public Config applyUserspaceConfig(final ObservableTunnel tunnel, final Config config) throws Exception {
+    public Config applyUserspaceConfig(final Tunnel tunnel, final Config config) throws Exception {
         throw new RuntimeException("Not implemented");
     }
 
diff --git a/tunnel/tools/libwg-go/api-android.go b/tunnel/tools/libwg-go/api-android.go
index 6c65ae10..c521dd5c 100644
--- a/tunnel/tools/libwg-go/api-android.go
+++ b/tunnel/tools/libwg-go/api-android.go
@@ -11,13 +11,12 @@ import "C"
 
 import (
 	"bufio"
-	"bytes"
-	"fmt"
 	"golang.org/x/sys/unix"
 	"golang.zx2c4.com/wireguard/device"
 	"golang.zx2c4.com/wireguard/ipc"
 	"golang.zx2c4.com/wireguard/tun"
 	"bytes"
+	"fmt"
 	"log"
 	"math"
 	"net"