aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/org/connectbot/service/TerminalBridge.java
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2015-09-11 10:57:30 -0700
committerKenny Root <kenny@the-b.org>2015-09-11 11:01:56 -0700
commit2baa56c2629532adad82d0f67abe9dd568a24760 (patch)
treea2389ad30251f44dfa9c388cf8c1cee18e5c1338 /app/src/main/java/org/connectbot/service/TerminalBridge.java
parent5d2ebeaa409fb2f74fe9eb799793cc004f9d9d29 (diff)
downloadconnectbot-2baa56c2629532adad82d0f67abe9dd568a24760.tar.gz
connectbot-2baa56c2629532adad82d0f67abe9dd568a24760.tar.bz2
connectbot-2baa56c2629532adad82d0f67abe9dd568a24760.zip
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.
Diffstat (limited to 'app/src/main/java/org/connectbot/service/TerminalBridge.java')
-rw-r--r--app/src/main/java/org/connectbot/service/TerminalBridge.java11
1 files changed, 4 insertions, 7 deletions
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;