diff options
author | Samuel Holland <samuel@sholland.org> | 2018-01-06 04:15:36 -0600 |
---|---|---|
committer | Samuel Holland <samuel@sholland.org> | 2018-01-06 05:18:34 -0600 |
commit | dbed7155d611071eae969559be67d75b2996d4a8 (patch) | |
tree | 36818698b8ae71ab887d0bf06facd1ec7646b912 /app/src/main/java/com/wireguard/android/activity/BaseActivity.java | |
parent | databinding: Collection classes use generic E (diff) | |
download | wireguard-android-dbed7155d611071eae969559be67d75b2996d4a8.tar.xz wireguard-android-dbed7155d611071eae969559be67d75b2996d4a8.zip |
activity: Remove useless indirection
Signed-off-by: Samuel Holland <samuel@sholland.org>
Diffstat (limited to 'app/src/main/java/com/wireguard/android/activity/BaseActivity.java')
-rw-r--r-- | app/src/main/java/com/wireguard/android/activity/BaseActivity.java | 10 |
1 files changed, 4 insertions, 6 deletions
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 { |