WIP compilation fixes

4 files changed, 3 insertions, 4 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 9afda719..5a031eda 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 952a30f0..1f2eac43 100644
--- a/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java
+++ b/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java
@@ -68,7 +68,7 @@ public final class GoBackend implements Backend {
     private static native String wgVersion();
 
     @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 c6a63691..ab4c6d24 100644
--- a/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
+++ b/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
@@ -55,7 +55,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 9ccd913f..0cf43c3e 100644
--- a/tunnel/tools/libwg-go/api-android.go
+++ b/tunnel/tools/libwg-go/api-android.go
@@ -11,7 +11,6 @@ import "C"
 
 import (
 	"bufio"
-	"bytes"
 	"golang.org/x/sys/unix"
 	"golang.zx2c4.com/wireguard/device"
 	"golang.zx2c4.com/wireguard/ipc"