2 files changed, 7 insertions, 15 deletions
diff --git a/app/src/main/java/com/wireguard/android/model/ObservableTunnel.java b/app/src/main/java/com/wireguard/android/model/ObservableTunnel.java
index 826a6a2a..ce3197f2 100644
--- a/app/src/main/java/com/wireguard/android/model/ObservableTunnel.java
+++ b/app/src/main/java/com/wireguard/android/model/ObservableTunnel.java
@@ -96,7 +96,7 @@ public class ObservableTunnel extends BaseObservable implements Keyed<String>, T
         return config;
     }
 
-    public String onNameChanged(final String name) {
+    String onNameChanged(final String name) {
         this.name = name;
         notifyPropertyChanged(BR.name);
         return name;
@@ -110,6 +110,11 @@ public class ObservableTunnel extends BaseObservable implements Keyed<String>, T
         return state;
     }
 
+    @Override
+    public void onStateChange(final State newState) {
+        onStateChanged(state);
+    }
+
     @Nullable
     Statistics onStatisticsChanged(@Nullable final Statistics statistics) {
         this.statistics = statistics;
diff --git a/app/src/main/java/com/wireguard/android/model/TunnelManager.java b/app/src/main/java/com/wireguard/android/model/TunnelManager.java
index e7bb9cd5..35d56c81 100644
--- a/app/src/main/java/com/wireguard/android/model/TunnelManager.java
+++ b/app/src/main/java/com/wireguard/android/model/TunnelManager.java
@@ -15,7 +15,6 @@ import androidx.annotation.Nullable;
 import com.wireguard.android.Application;
 import com.wireguard.android.BR;
 import com.wireguard.android.R;
-import com.wireguard.android.backend.Backend.TunnelStateChangeNotificationReceiver;
 import com.wireguard.android.configStore.ConfigStore;
 import com.wireguard.android.backend.Tunnel;
 import com.wireguard.android.backend.Tunnel.State;
@@ -40,7 +39,7 @@ import java9.util.stream.StreamSupport;
  * Maintains and mediates changes to the set of available WireGuard tunnels,
  */
 
-public final class TunnelManager extends BaseObservable implements TunnelStateChangeNotificationReceiver {
+public final class TunnelManager extends BaseObservable {
     private static final Comparator<String> COMPARATOR = Comparators.<String>thenComparing(
             String.CASE_INSENSITIVE_ORDER, Comparators.naturalOrder());
     private static final String KEY_LAST_USED_TUNNEL = "last_used_tunnel";
@@ -57,13 +56,6 @@ public final class TunnelManager extends BaseObservable implements TunnelStateCh
 
     public TunnelManager(final ConfigStore configStore) {
         this.configStore = configStore;
-        Application.getBackendAsync().thenAccept(backend -> backend.registerStateChangeNotification(this));
-    }
-
-    @Override
-    protected void finalize() throws Throwable {
-        Application.getBackendAsync().thenAccept(backend -> backend.unregisterStateChangeNotification(this));
-        super.finalize();
     }
 
     static CompletionStage<State> getTunnelState(final ObservableTunnel tunnel) {
@@ -266,11 +258,6 @@ public final class TunnelManager extends BaseObservable implements TunnelStateCh
         });
     }
 
-    @Override
-    public void tunnelStateChange(final Tunnel tunnel, final State state) {
-        ((ObservableTunnel)tunnel).onStateChanged(state);
-    }
-
     public static final class IntentReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(final Context context, @Nullable final Intent intent) {