From dbed7155d611071eae969559be67d75b2996d4a8 Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Sat, 6 Jan 2018 04:15:36 -0600 Subject: activity: Remove useless indirection Signed-off-by: Samuel Holland --- .../main/java/com/wireguard/android/activity/BaseActivity.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'app/src/main/java/com/wireguard/android/activity/BaseActivity.java') diff --git a/app/src/main/java/com/wireguard/android/activity/BaseActivity.java b/app/src/main/java/com/wireguard/android/activity/BaseActivity.java index 4bd3407e..3a6941b9 100644 --- a/app/src/main/java/com/wireguard/android/activity/BaseActivity.java +++ b/app/src/main/java/com/wireguard/android/activity/BaseActivity.java @@ -53,7 +53,7 @@ public abstract class BaseActivity extends Activity { super.onSaveInstanceState(outState); } - protected abstract Tunnel onSelectedTunnelChanged(Tunnel oldTunnel, Tunnel newTunnel); + protected abstract void onSelectedTunnelChanged(Tunnel oldTunnel, Tunnel newTunnel); public void removeOnSelectedTunnelChangedListener( final OnSelectedTunnelChangedListener listener) { @@ -64,11 +64,9 @@ public abstract class BaseActivity extends Activity { final Tunnel oldTunnel = selectedTunnel; if (Objects.equals(oldTunnel, tunnel)) return; - // Give the activity a chance to override the tunnel change. - selectedTunnel = onSelectedTunnelChanged(oldTunnel, tunnel); - if (Objects.equals(oldTunnel, selectedTunnel)) - return; - selectionChangeRegistry.notifyCallbacks(oldTunnel, 0, selectedTunnel); + selectedTunnel = tunnel; + onSelectedTunnelChanged(oldTunnel, tunnel); + selectionChangeRegistry.notifyCallbacks(oldTunnel, 0, tunnel); } public interface OnSelectedTunnelChangedListener { -- cgit v1.3-18-gd494