* Fix post-login automatiion that was broken with the bean patch

3 files changed, 10 insertions, 12 deletions

diff --git a/src/org/connectbot/bean/HostBean.java b/src/org/connectbot/bean/HostBean.java
index 683ed15..81fe5dc 100644
--- a/src/org/connectbot/bean/HostBean.java
+++ b/src/org/connectbot/bean/HostBean.java
@@ -37,7 +37,7 @@ public class HostBean {
 	private long lastConnect = -1;
 	private String color;
 	private boolean useKeys = true;
-	private byte[] postLogin = null;
+	private String postLogin = null;
 	private long pubkeyId = -1;
 	private boolean wantSession = true;
 	private boolean compression = false;
@@ -113,10 +113,10 @@ public class HostBean {
 	public boolean getUseKeys() {
 		return useKeys;
 	}
-	public void setPostLogin(byte[] postLogin) {
+	public void setPostLogin(String postLogin) {
 		this.postLogin = postLogin;
 	}
-	public byte[] getPostLogin() {
+	public String getPostLogin() {
 		return postLogin;
 	}
 	public void setPubkeyId(long pubkeyId) {
diff --git a/src/org/connectbot/service/TerminalBridge.java b/src/org/connectbot/service/TerminalBridge.java
index d55ad5f..85d78cf 100644
--- a/src/org/connectbot/service/TerminalBridge.java
+++ b/src/org/connectbot/service/TerminalBridge.java
@@ -87,6 +87,8 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal
 		AUTH_PASSWORD = "password",
 		AUTH_KEYBOARDINTERACTIVE = "keyboard-interactive";
 	
+	public final static int AUTH_TRIES = 20;
+
 	private int darken(int color) {
 		return Color.argb(0xFF,
 			(int)(Color.red(color) * 0.8),
@@ -143,6 +145,8 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal
 
 	private boolean sessionOpen = false;
 
+	protected boolean disconnectFlag = false;
+
 	private boolean forcedSize = false;
 	private int termWidth;
 	private int termHeight;
@@ -264,8 +268,6 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal
 		this.connection.addConnectionMonitor(this);
 	}
 	
-	public final static int AUTH_TRIES = 20;
-	
 	/**
 	 * Spawn thread to open connection and start login process.
 	 */
@@ -549,9 +551,7 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal
 			setSessionOpen(true);
 			
 			// finally send any post-login string, if requested
-			byte[] postLogin = host.getPostLogin();
-			if (postLogin != null)
-				injectString(new String(postLogin));
+			injectString(host.getPostLogin());
 
 		} catch (IOException e1) {
 			Log.e(TAG, "Problem while trying to create PTY in finishConnection()", e1);
@@ -579,8 +579,6 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal
 		this.disconnectListener = disconnectListener;
 	}
 	
-	protected boolean disconnectFlag = false;
-	
 	/**
 	 * Force disconnection of this terminal bridge.
 	 */
diff --git a/src/org/connectbot/util/HostDatabase.java b/src/org/connectbot/util/HostDatabase.java
index 978c9d7..0ccf5c0 100644
--- a/src/org/connectbot/util/HostDatabase.java
+++ b/src/org/connectbot/util/HostDatabase.java
@@ -229,7 +229,7 @@ public class HostDatabase extends SQLiteOpenHelper {
 			host.setLastConnect(c.getLong(COL_LASTCONNECT));
 			host.setColor(c.getString(COL_COLOR));
 			host.setUseKeys(Boolean.valueOf(c.getString(COL_USEKEYS)));
-			host.setPostLogin(c.getBlob(COL_POSTLOGIN));
+			host.setPostLogin(c.getString(COL_POSTLOGIN));
 			host.setPubkeyId(c.getLong(COL_PUBKEYID));
 			host.setWantSession(Boolean.valueOf(c.getString(COL_WANTSESSION)));
 			host.setCompression(Boolean.valueOf(c.getString(COL_COMPRESSION)));
@@ -308,7 +308,7 @@ public class HostDatabase extends SQLiteOpenHelper {
 		host.setLastConnect(c.getLong(c.getColumnIndexOrThrow(FIELD_HOST_LASTCONNECT)));
 		host.setColor(c.getString(c.getColumnIndexOrThrow(FIELD_HOST_COLOR)));
 		host.setUseKeys(Boolean.valueOf(c.getString(c.getColumnIndexOrThrow(FIELD_HOST_USEKEYS))));
-		host.setPostLogin(c.getBlob(c.getColumnIndexOrThrow(FIELD_HOST_POSTLOGIN)));
+		host.setPostLogin(c.getString(c.getColumnIndexOrThrow(FIELD_HOST_POSTLOGIN)));
 		host.setPubkeyId(c.getLong(c.getColumnIndexOrThrow(FIELD_HOST_PUBKEYID)));
 		host.setWantSession(Boolean.valueOf(c.getString(c.getColumnIndexOrThrow(FIELD_HOST_WANTSESSION))));
 		host.setCompression(Boolean.valueOf(c.getString(c.getColumnIndexOrThrow(FIELD_HOST_COMPRESSION))));