From 01f03747b051f02a37a139a7ed9562d9a21a05e9 Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari <s.kaspari@googlemail.com>
Date: Sat, 13 Mar 2010 14:58:01 +0100
Subject: [PATCH] Use nickname and ident of the identity

---
 src/org/yaaic/irc/IRCBinder.java     |  7 ++++++-
 src/org/yaaic/irc/IRCConnection.java | 22 ++++++++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/org/yaaic/irc/IRCBinder.java b/src/org/yaaic/irc/IRCBinder.java
index 8bdb33d..bd499d6 100644
--- a/src/org/yaaic/irc/IRCBinder.java
+++ b/src/org/yaaic/irc/IRCBinder.java
@@ -58,7 +58,12 @@ public class IRCBinder extends Binder
 		new Thread() {
 			public void run() {
 				try {
-					getService().getConnection(server.getId()).connect(server.getHost());
+					IRCConnection connection = getService().getConnection(server.getId());
+
+					connection.setNickname(server.getIdentity().getNickname());
+					connection.setIdent(server.getIdentity().getIdent());
+					
+					connection.connect(server.getHost());
 				}
 				catch (Exception e) {
 					Log.d(TAG, "Exception: " + e.getMessage());
diff --git a/src/org/yaaic/irc/IRCConnection.java b/src/org/yaaic/irc/IRCConnection.java
index c857579..c7e52f4 100644
--- a/src/org/yaaic/irc/IRCConnection.java
+++ b/src/org/yaaic/irc/IRCConnection.java
@@ -60,11 +60,29 @@ public class IRCConnection extends PircBot
 		this.server = Yaaic.getInstance().getServerById(serverId);
 		this.service = service;
 		
-		this.setName("Yaaic");
-		this.setLogin("Yaaic");
 		this.setAutoNickChange(true);
 		this.setVersion("Yaaic - Yet another Android IRC client - http://www.yaaic.org");
 	}
+	
+	/**
+	 * Set the nickname of the user
+	 * 
+	 * @param nickname The nickname to use
+	 */
+	public void setNickname(String nickname)
+	{
+		this.setName(nickname);
+	}
+
+	/**
+	 * Set the ident of the user
+	 * 
+	 * @param ident The ident to use
+	 */
+	public void setIdent(String ident)
+	{
+		this.setLogin(ident);
+	}
 
 	/**
 	 * On connect