* fresh check-out build fix

* Various cosmetic bugs with pubkeys

3 files changed, 12 insertions, 9 deletions

diff --git a/src/org/connectbot/PubkeyListActivity.java b/src/org/connectbot/PubkeyListActivity.java
index e98bf06..e68f658 100644
--- a/src/org/connectbot/PubkeyListActivity.java
+++ b/src/org/connectbot/PubkeyListActivity.java
@@ -369,14 +369,14 @@ public class PubkeyListActivity extends ListActivity implements EventListener {
 			}
 		});
 
-		MenuItem copyToClipboard = menu.add(R.string.pubkey_copy_clipboard);
-		copyToClipboard.setEnabled(!imported);
-		copyToClipboard.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+		MenuItem copyPublicToClipboard = menu.add(R.string.pubkey_copy_clipboard);
+		copyPublicToClipboard.setEnabled(!imported);
+		copyPublicToClipboard.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 			public boolean onMenuItemClick(MenuItem item) {
 				try {
 					PublicKey pk = PubkeyUtils.decodePublic(pubkey.getPublicKey(), pubkey.getType());
-					String openSSHPubkey = new String(PubkeyUtils.convertToOpenSSHFormat(pk));
-										
+					String openSSHPubkey = new String(PubkeyUtils.convertToOpenSSHFormat(pk, pubkey.getNickname()));
+
 					clipboard.setText(openSSHPubkey);
 				} catch (Exception e) {
 					e.printStackTrace();
diff --git a/src/org/connectbot/service/TerminalBridge.java b/src/org/connectbot/service/TerminalBridge.java
index 9b53af8..60156eb 100644
--- a/src/org/connectbot/service/TerminalBridge.java
+++ b/src/org/connectbot/service/TerminalBridge.java
@@ -394,7 +394,7 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal
 			}
 		}
 
-		return this.tryPublicKey(host.getUsername(), host.getNickname(), trileadKey);
+		return this.tryPublicKey(host.getUsername(), pubkey.getNickname(), trileadKey);
 		
 	}
 	
diff --git a/src/org/connectbot/util/PubkeyUtils.java b/src/org/connectbot/util/PubkeyUtils.java
index e13129e..63e96c3 100644
--- a/src/org/connectbot/util/PubkeyUtils.java
+++ b/src/org/connectbot/util/PubkeyUtils.java
@@ -162,17 +162,20 @@ public class PubkeyUtils {
 	 * OpenSSH compatibility methods 
 	 */
 	
-	public static String convertToOpenSSHFormat(PublicKey pk) throws IOException, InvalidKeyException {
+	public static String convertToOpenSSHFormat(PublicKey pk, String nickname) throws IOException, InvalidKeyException {
+		if (nickname == null)
+			nickname = "connectbot@android";
+
 		if (pk instanceof RSAPublicKey) {
 			String data = "ssh-rsa ";
 			data += String.valueOf(Base64.encode(RSASHA1Verify.encodeSSHRSAPublicKey(
 					(com.trilead.ssh2.signature.RSAPublicKey)convertToTrilead(pk))));
-			return data + " connectbot@android";
+			return data + " " + nickname;
 		} else if (pk instanceof DSAPublicKey) {
 			String data = "ssh-dss ";
 			data += String.valueOf(Base64.encode(DSASHA1Verify.encodeSSHDSAPublicKey(
 					(com.trilead.ssh2.signature.DSAPublicKey)convertToTrilead(pk))));
-			return data + " connectbot@android";
+			return data + " " + nickname;
 		}
 		
 		throw new InvalidKeyException("Unknown key type");