From f01a15d182023cf5075528f1ce5435c3ee19b16d Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sat, 9 Sep 2017 11:49:15 -0700 Subject: [PATCH] Removed duplicated current address logic --- app/src/main/java/com/limelight/PcView.java | 28 ++----------------- .../computers/ComputerManagerService.java | 12 ++------ .../grid/assets/NetworkAssetLoader.java | 12 ++------ .../com/limelight/utils/ServerHelper.java | 3 +- 4 files changed, 7 insertions(+), 48 deletions(-) diff --git a/app/src/main/java/com/limelight/PcView.java b/app/src/main/java/com/limelight/PcView.java index 04d40b8e..f048d20b 100644 --- a/app/src/main/java/com/limelight/PcView.java +++ b/app/src/main/java/com/limelight/PcView.java @@ -306,19 +306,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks { // Stop updates and wait while pairing stopComputerUpdates(true); - InetAddress addr; - if (computer.reachability == ComputerDetails.Reachability.LOCAL) { - addr = computer.localIp; - } - else if (computer.reachability == ComputerDetails.Reachability.REMOTE) { - addr = computer.remoteIp; - } - else { - LimeLog.warning("Unknown reachability - using local IP"); - addr = computer.localIp; - } - - httpConn = new NvHTTP(addr, + httpConn = new NvHTTP(ServerHelper.getCurrentAddressFromComputer(computer), managerBinder.getUniqueId(), PlatformBinding.getDeviceName(), PlatformBinding.getCryptoProvider(PcView.this)); @@ -443,19 +431,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks { NvHTTP httpConn; String message; try { - InetAddress addr; - if (computer.reachability == ComputerDetails.Reachability.LOCAL) { - addr = computer.localIp; - } - else if (computer.reachability == ComputerDetails.Reachability.REMOTE) { - addr = computer.remoteIp; - } - else { - LimeLog.warning("Unknown reachability - using local IP"); - addr = computer.localIp; - } - - httpConn = new NvHTTP(addr, + httpConn = new NvHTTP(ServerHelper.getCurrentAddressFromComputer(computer), managerBinder.getUniqueId(), PlatformBinding.getDeviceName(), PlatformBinding.getCryptoProvider(PcView.this)); diff --git a/app/src/main/java/com/limelight/computers/ComputerManagerService.java b/app/src/main/java/com/limelight/computers/ComputerManagerService.java index 62d7781d..928fa550 100644 --- a/app/src/main/java/com/limelight/computers/ComputerManagerService.java +++ b/app/src/main/java/com/limelight/computers/ComputerManagerService.java @@ -20,6 +20,7 @@ import com.limelight.nvstream.http.NvHTTP; import com.limelight.nvstream.mdns.MdnsComputer; import com.limelight.nvstream.mdns.MdnsDiscoveryListener; import com.limelight.utils.CacheHelper; +import com.limelight.utils.ServerHelper; import android.app.Service; import android.content.ComponentName; @@ -694,8 +695,6 @@ public class ComputerManagerService extends Service { public void run() { int emptyAppListResponses = 0; do { - InetAddress selectedAddr; - // Can't poll if it's not online if (computer.state != ComputerDetails.State.ONLINE) { if (listener != null) { @@ -709,14 +708,7 @@ public class ComputerManagerService extends Service { continue; } - if (computer.reachability == ComputerDetails.Reachability.LOCAL) { - selectedAddr = computer.localIp; - } - else { - selectedAddr = computer.remoteIp; - } - - NvHTTP http = new NvHTTP(selectedAddr, idManager.getUniqueId(), + NvHTTP http = new NvHTTP(ServerHelper.getCurrentAddressFromComputer(computer), idManager.getUniqueId(), null, PlatformBinding.getCryptoProvider(ComputerManagerService.this)); PollingTuple tuple = getPollingTuple(computer); diff --git a/app/src/main/java/com/limelight/grid/assets/NetworkAssetLoader.java b/app/src/main/java/com/limelight/grid/assets/NetworkAssetLoader.java index c43e51fb..8506f045 100644 --- a/app/src/main/java/com/limelight/grid/assets/NetworkAssetLoader.java +++ b/app/src/main/java/com/limelight/grid/assets/NetworkAssetLoader.java @@ -6,6 +6,7 @@ import com.limelight.LimeLog; import com.limelight.binding.PlatformBinding; import com.limelight.nvstream.http.ComputerDetails; import com.limelight.nvstream.http.NvHTTP; +import com.limelight.utils.ServerHelper; import java.io.IOException; import java.io.InputStream; @@ -21,7 +22,7 @@ public class NetworkAssetLoader { } public InputStream getBitmapStream(CachedAppAssetLoader.LoaderTuple tuple) { - NvHTTP http = new NvHTTP(getCurrentAddress(tuple.computer), uniqueId, null, PlatformBinding.getCryptoProvider(context)); + NvHTTP http = new NvHTTP(ServerHelper.getCurrentAddressFromComputer(tuple.computer), uniqueId, null, PlatformBinding.getCryptoProvider(context)); InputStream in = null; try { @@ -37,13 +38,4 @@ public class NetworkAssetLoader { return in; } - - private static InetAddress getCurrentAddress(ComputerDetails computer) { - if (computer.reachability == ComputerDetails.Reachability.LOCAL) { - return computer.localIp; - } - else { - return computer.remoteIp; - } - } } diff --git a/app/src/main/java/com/limelight/utils/ServerHelper.java b/app/src/main/java/com/limelight/utils/ServerHelper.java index 0a21e5c0..24b6194e 100644 --- a/app/src/main/java/com/limelight/utils/ServerHelper.java +++ b/app/src/main/java/com/limelight/utils/ServerHelper.java @@ -27,8 +27,7 @@ public class ServerHelper { ComputerManagerService.ComputerManagerBinder managerBinder) { Intent intent = new Intent(parent, Game.class); intent.putExtra(Game.EXTRA_HOST, - computer.reachability == ComputerDetails.Reachability.LOCAL ? - computer.localIp.getHostAddress() : computer.remoteIp.getHostAddress()); + getCurrentAddressFromComputer(computer).getHostAddress()); intent.putExtra(Game.EXTRA_APP_NAME, app.getAppName()); intent.putExtra(Game.EXTRA_APP_ID, app.getAppId()); intent.putExtra(Game.EXTRA_UNIQUEID, managerBinder.getUniqueId());