From 363d0b9126895c97c1a488f6f20a2ada700fff6f Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 27 Jun 2018 23:10:37 +0530 Subject: android: model: Make some methods static Signed-off-by: Harsh Shandilya --- app/src/main/java/com/wireguard/android/model/Tunnel.java | 6 +++--- app/src/main/java/com/wireguard/android/model/TunnelManager.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'app/src/main/java/com/wireguard') diff --git a/app/src/main/java/com/wireguard/android/model/Tunnel.java b/app/src/main/java/com/wireguard/android/model/Tunnel.java index 0b1ba895..fb8da252 100644 --- a/app/src/main/java/com/wireguard/android/model/Tunnel.java +++ b/app/src/main/java/com/wireguard/android/model/Tunnel.java @@ -80,21 +80,21 @@ public class Tunnel extends BaseObservable implements Keyed { } public CompletionStage getStateAsync() { - return manager.getTunnelState(this); + return TunnelManager.getTunnelState(this); } @Bindable public Statistics getStatistics() { // FIXME: Check age of statistics. if (statistics == null) - manager.getTunnelStatistics(this).whenComplete(ExceptionLoggers.E); + TunnelManager.getTunnelStatistics(this).whenComplete(ExceptionLoggers.E); return statistics; } public CompletionStage getStatisticsAsync() { // FIXME: Check age of statistics. if (statistics == null) - return manager.getTunnelStatistics(this); + return TunnelManager.getTunnelStatistics(this); return CompletableFuture.completedFuture(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 d0b30415..dc706643 100644 --- a/app/src/main/java/com/wireguard/android/model/TunnelManager.java +++ b/app/src/main/java/com/wireguard/android/model/TunnelManager.java @@ -112,12 +112,12 @@ public final class TunnelManager extends BaseObservable { .thenApply(tunnel::onConfigChanged); } - CompletionStage getTunnelState(final Tunnel tunnel) { + static CompletionStage getTunnelState(final Tunnel tunnel) { return Application.getAsyncWorker().supplyAsync(() -> Application.getBackend().getState(tunnel)) .thenApply(tunnel::onStateChanged); } - CompletionStage getTunnelStatistics(final Tunnel tunnel) { + static CompletionStage getTunnelStatistics(final Tunnel tunnel) { return Application.getAsyncWorker().supplyAsync(() -> Application.getBackend().getStatistics(tunnel)) .thenApply(tunnel::onStatisticsChanged); } -- cgit v1.2.3