From 8114c1ec3ec2eb7f41add2a74bed51237b6b918a Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Fri, 11 Sep 2015 13:14:37 -0700 Subject: Switch TerminalBridge over to ColorStorage and HostStorage --- app/src/main/java/org/connectbot/service/TerminalBridge.java | 6 +++--- app/src/main/java/org/connectbot/service/TerminalManager.java | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'app/src/main/java/org/connectbot/service') diff --git a/app/src/main/java/org/connectbot/service/TerminalBridge.java b/app/src/main/java/org/connectbot/service/TerminalBridge.java index 6e4990e..b9e29e8 100644 --- a/app/src/main/java/org/connectbot/service/TerminalBridge.java +++ b/app/src/main/java/org/connectbot/service/TerminalBridge.java @@ -65,7 +65,7 @@ public class TerminalBridge implements VDUDisplay { private final static int FONT_SIZE_STEP = 2; private final float displayDensity; - public Integer[] color; + public int[] color; public int defaultFg = HostDatabase.DEFAULT_FG_COLOR; public int defaultBg = HostDatabase.DEFAULT_BG_COLOR; @@ -950,11 +950,11 @@ public class TerminalBridge implements VDUDisplay { } public final void resetColors() { - int[] defaults = manager.hostdb.getDefaultColorsForScheme(HostDatabase.DEFAULT_COLOR_SCHEME); + int[] defaults = manager.colordb.getDefaultColorsForScheme(HostDatabase.DEFAULT_COLOR_SCHEME); defaultFg = defaults[0]; defaultBg = defaults[1]; - color = manager.hostdb.getColorsForScheme(HostDatabase.DEFAULT_COLOR_SCHEME); + color = manager.colordb.getColorsForScheme(HostDatabase.DEFAULT_COLOR_SCHEME); } private static Pattern urlPattern = null; diff --git a/app/src/main/java/org/connectbot/service/TerminalManager.java b/app/src/main/java/org/connectbot/service/TerminalManager.java index 1f0ee29..88c0811 100644 --- a/app/src/main/java/org/connectbot/service/TerminalManager.java +++ b/app/src/main/java/org/connectbot/service/TerminalManager.java @@ -35,6 +35,8 @@ import java.util.TimerTask; import org.connectbot.R; import org.connectbot.bean.HostBean; import org.connectbot.bean.PubkeyBean; +import org.connectbot.data.ColorStorage; +import org.connectbot.data.HostStorage; import org.connectbot.transport.TransportFactory; import org.connectbot.util.HostDatabase; import org.connectbot.util.PreferenceConstants; @@ -87,7 +89,8 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen public Resources res; - public HostDatabase hostdb; + public HostStorage hostdb; + public ColorStorage colordb; public PubkeyDatabase pubkeydb; protected SharedPreferences prefs; @@ -130,6 +133,7 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen pubkeyTimer = new Timer("pubkeyTimer", true); hostdb = HostDatabase.get(this); + colordb = HostDatabase.get(this); pubkeydb = PubkeyDatabase.get(this); // load all marked pubkeys into memory -- cgit v1.2.3