# HG changeset patch # User Carl Byington # Date 1402964044 25200 # Node ID e3b83c4f02f1c9c6cf5a15903b0bb788d5a9bb0d # Parent 3a58bc86cd6fd336c9bdac766b6c240afa46ca90 remove 5250 configuration diff -r 3a58bc86cd6f -r e3b83c4f02f1 src/com/five_ten_sg/connectbot/TerminalView.java --- a/src/com/five_ten_sg/connectbot/TerminalView.java Mon Jun 16 16:50:13 2014 -0700 +++ b/src/com/five_ten_sg/connectbot/TerminalView.java Mon Jun 16 17:14:04 2014 -0700 @@ -62,7 +62,6 @@ private final Context context; public final TerminalBridge bridge; - public static String homeDirectory; private final Paint paint; private final Paint cursorPaint; private final Paint cursorStrokePaint; @@ -100,7 +99,6 @@ super(context); this.context = context; this.bridge = bridge; - homeDirectory = context.getApplicationInfo().dataDir; paint = new Paint(); setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT)); setFocusable(true); diff -r 3a58bc86cd6f -r e3b83c4f02f1 src/com/five_ten_sg/connectbot/service/TerminalBridge.java --- a/src/com/five_ten_sg/connectbot/service/TerminalBridge.java Mon Jun 16 16:50:13 2014 -0700 +++ b/src/com/five_ten_sg/connectbot/service/TerminalBridge.java Mon Jun 16 17:14:04 2014 -0700 @@ -86,8 +86,8 @@ public int defaultBg = HostDatabase.DEFAULT_BG_COLOR; protected final TerminalManager manager; - - public HostBean host; + public final HostBean host; + public final String homeDirectory; AbsTransport transport; @@ -168,10 +168,11 @@ /** * Create new terminal bridge with following parameters. */ - public TerminalBridge(final TerminalManager manager, final HostBean host) throws IOException { + public TerminalBridge(final TerminalManager manager, final HostBean host, final String homeDirectory) throws IOException { float hostFontSize; - this.manager = manager; - this.host = host; + this.manager = manager; + this.host = host; + this.homeDirectory = homeDirectory; emulation = host.getHostEmulation(); if ((emulation == null) || (emulation.length() == 0)) emulation = manager.getEmulation(); // create prompt helper to relay password and hostkey requests up to gui @@ -211,7 +212,7 @@ */ protected void startConnection() { transport = TransportFactory.getTransport(host.getProtocol()); - transport.setLinks(manager, this, TerminalView.homeDirectory, host, emulation); + transport.setLinks(manager, this, homeDirectory, host, emulation); buffer = transport.getTransportBuffer(); keyListener = transport.getTerminalKeyListener(); diff -r 3a58bc86cd6f -r e3b83c4f02f1 src/com/five_ten_sg/connectbot/service/TerminalManager.java --- a/src/com/five_ten_sg/connectbot/service/TerminalManager.java Mon Jun 16 16:50:13 2014 -0700 +++ b/src/com/five_ten_sg/connectbot/service/TerminalManager.java Mon Jun 16 17:14:04 2014 -0700 @@ -223,7 +223,7 @@ throw new IllegalArgumentException("Connection already open for that nickname"); } - TerminalBridge bridge = new TerminalBridge(this, host); + TerminalBridge bridge = new TerminalBridge(this, host, getApplicationInfo().dataDir); bridge.setOnDisconnectedListener(this); bridge.startConnection();