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/HostListActivity.java | 3 ++- app/src/main/java/org/connectbot/data/HostStorage.java | 2 +- app/src/main/java/org/connectbot/service/TerminalBridge.java | 6 +++--- app/src/main/java/org/connectbot/service/TerminalManager.java | 6 +++++- app/src/main/java/org/connectbot/transport/SSH.java | 5 ++--- app/src/main/java/org/connectbot/transport/TransportFactory.java | 4 ++-- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/org/connectbot/HostListActivity.java b/app/src/main/java/org/connectbot/HostListActivity.java index 67a0098..d9e7d16 100644 --- a/app/src/main/java/org/connectbot/HostListActivity.java +++ b/app/src/main/java/org/connectbot/HostListActivity.java @@ -20,6 +20,7 @@ package org.connectbot; import java.util.List; import org.connectbot.bean.HostBean; +import org.connectbot.data.HostStorage; import org.connectbot.service.OnHostStatusChangedListener; import org.connectbot.service.TerminalBridge; import org.connectbot.service.TerminalManager; @@ -71,7 +72,7 @@ public class HostListActivity extends ListActivity implements OnHostStatusChange protected TerminalManager bound = null; - protected HostDatabase hostdb; + private HostStorage hostdb; private List hosts; protected LayoutInflater inflater = null; diff --git a/app/src/main/java/org/connectbot/data/HostStorage.java b/app/src/main/java/org/connectbot/data/HostStorage.java index 9d4fc7d..dc3e5d7 100644 --- a/app/src/main/java/org/connectbot/data/HostStorage.java +++ b/app/src/main/java/org/connectbot/data/HostStorage.java @@ -85,5 +85,5 @@ public interface HostStorage { /** * Return all port forwards for the given {@code host}. */ - PortForwardBean[] getPortForwardsForHost(HostBean host); + List getPortForwardsForHost(HostBean host); } 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 diff --git a/app/src/main/java/org/connectbot/transport/SSH.java b/app/src/main/java/org/connectbot/transport/SSH.java index 4bad2f1..0867256 100644 --- a/app/src/main/java/org/connectbot/transport/SSH.java +++ b/app/src/main/java/org/connectbot/transport/SSH.java @@ -292,9 +292,8 @@ public class SSH extends AbsTransport implements ConnectionMonitor, InteractiveC } /** - * Attempt connection with database row pointed to by cursor. - * @param cursor - * @return true for successful authentication + * Attempt connection with given {@code pubkey}. + * @return {@code true} for successful authentication * @throws NoSuchAlgorithmException * @throws InvalidKeySpecException * @throws IOException diff --git a/app/src/main/java/org/connectbot/transport/TransportFactory.java b/app/src/main/java/org/connectbot/transport/TransportFactory.java index 3f387c6..4576a22 100644 --- a/app/src/main/java/org/connectbot/transport/TransportFactory.java +++ b/app/src/main/java/org/connectbot/transport/TransportFactory.java @@ -21,6 +21,7 @@ import java.util.HashMap; import java.util.Map; import org.connectbot.bean.HostBean; +import org.connectbot.data.HostStorage; import org.connectbot.util.HostDatabase; import android.content.Context; @@ -112,10 +113,9 @@ public class TransportFactory { /** * @param hostdb Handle to HostDatabase * @param uri URI to target server - * @param host HostBean in which to put the results * @return true when host was found */ - public static HostBean findHost(HostDatabase hostdb, Uri uri) { + public static HostBean findHost(HostStorage hostdb, Uri uri) { AbsTransport transport = getTransport(uri.getScheme()); Map selection = new HashMap(); -- cgit v1.2.3