From 2baa56c2629532adad82d0f67abe9dd568a24760 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Fri, 11 Sep 2015 10:57:30 -0700 Subject: Revert "Never cache instances of the HostDatabase" This reverts commit 57afa9bdc5b269a48bd27fc8455cab4cb956d02a. This won't work with injection and makes testing a bit harder, so revert it. --- app/src/main/java/org/connectbot/service/TerminalBridge.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'app/src/main/java/org/connectbot/service/TerminalBridge.java') diff --git a/app/src/main/java/org/connectbot/service/TerminalBridge.java b/app/src/main/java/org/connectbot/service/TerminalBridge.java index 6f76b02..6d47f96 100644 --- a/app/src/main/java/org/connectbot/service/TerminalBridge.java +++ b/app/src/main/java/org/connectbot/service/TerminalBridge.java @@ -273,8 +273,7 @@ public class TerminalBridge implements VDUDisplay { transport.setEmulation(emulation); if (transport.canForwardPorts()) { - HostDatabase hostDb = HostDatabase.get(manager); - for (PortForwardBean portForward : hostDb.getPortForwardsForHost(host)) + for (PortForwardBean portForward : manager.hostdb.getPortForwardsForHost(host)) transport.addPortForward(portForward); } @@ -534,8 +533,7 @@ public class TerminalBridge implements VDUDisplay { } host.setFontSize((int) sizeDp); - HostDatabase hostDb = HostDatabase.get(manager); - hostDb.updateFontSize(host); + manager.hostdb.updateFontSize(host); forcedSize = false; } @@ -952,12 +950,11 @@ public class TerminalBridge implements VDUDisplay { } public final void resetColors() { - HostDatabase hostDb = HostDatabase.get(manager); - int[] defaults = hostDb.getDefaultColorsForScheme(HostDatabase.DEFAULT_COLOR_SCHEME); + int[] defaults = manager.hostdb.getDefaultColorsForScheme(HostDatabase.DEFAULT_COLOR_SCHEME); defaultFg = defaults[0]; defaultBg = defaults[1]; - color = hostDb.getColorsForScheme(HostDatabase.DEFAULT_COLOR_SCHEME); + color = manager.hostdb.getColorsForScheme(HostDatabase.DEFAULT_COLOR_SCHEME); } private static Pattern urlPattern = null; -- cgit v1.2.3