--- a/src/com/five_ten_sg/connectbot/transport/AbsTransport.java	Tue Jun 03 16:05:21 2014 -0700
+++ b/src/com/five_ten_sg/connectbot/transport/AbsTransport.java	Tue Jun 10 12:00:07 2014 -0700
@@ -35,20 +35,14 @@
  *
  */
 public abstract class AbsTransport {
-    HostBean host;
-    TerminalBridge bridge;
     TerminalManager manager;
-
-    String emulation;
+    TerminalBridge  bridge;
+    HostBean        host;
+    vt320           buffer;
+    String          emulation;
 
     public AbsTransport() {}
 
-    public AbsTransport(HostBean host, TerminalBridge bridge, TerminalManager manager) {
-        this.host = host;
-        this.bridge = bridge;
-        this.manager = manager;
-    }
-
     /**
      * @return protocol part of the URI
      */
@@ -56,7 +50,6 @@
         return "unknown";
     }
 
-
     /**
      * Encode the current transport into a URI that can be passed via intent calls.
      * @return URI to host
@@ -147,24 +140,16 @@
         // do nothing
     }
 
-    public void setEmulation(String emulation) {
-        this.emulation = emulation;
-    }
-
     public String getEmulation() {
         return emulation;
     }
 
-    public void setHost(HostBean host) {
-        this.host = host;
-    }
-
-    public void setBridge(TerminalBridge bridge) {
-        this.bridge = bridge;
-    }
-
-    public void setManager(TerminalManager manager) {
-        this.manager = manager;
+    public void setLinks(TerminalManager manager, TerminalBridge bridge, HostBean host, vt320 buffer, String emulation) {
+        this.manager   = manager;
+        this.bridge    = bridge;
+        this.host      = host;
+        this.buffer    = buffer;
+        this.emulation = emulation;
     }
 
     /**
@@ -250,14 +235,14 @@
         return false;
     }
 
-    public abstract boolean isConnected();
-    public abstract boolean isSessionOpen();
-    public abstract boolean isAuthenticated();
 
     /**
      * @return int default port for protocol
      */
     public abstract int getDefaultPort();
+    public abstract boolean isConnected();
+    public abstract boolean isSessionOpen();
+    public abstract boolean isAuthenticated();
 
     /**
      * @param username
@@ -302,8 +287,8 @@
     /**
      * @return a key listener
      */
-    public TerminalKeyListener getTerminalKeyListener(TerminalManager manager, TerminalBridge bridge, vt320 buffer, String encoding) {
-        return new TerminalKeyListener(manager, bridge, buffer, encoding);
+    public TerminalKeyListener getTerminalKeyListener() {
+        return new TerminalKeyListener(manager, bridge, buffer,  host.getEncoding());
     }
 
 }