Clear message buffer if view has been build from history

src/org/yaaic/adapter/MessageListAdapter.java

@@ -54,6 +54,8 @@ public class MessageListAdapter extends BaseAdapter
 		for (Message message : channel.getHistory()) {
 			messages.add(message.renderTextView(context));
 		}
+		
+		channel.clearBuffer();
 	}
 
 	/**

src/org/yaaic/model/Channel.java

@@ -91,8 +91,24 @@ public class Channel
 	 * 
 	 * @return
 	 */
-	public Message pollMessage()
+	public Message pollBufferedMessage()
 	{
 		return buffer.poll();
 	}
+	
+	/**
+	 * Does the channel have buffered messages?
+	 */
+	public boolean hasBufferedMessages()
+	{
+		return buffer.size() > 0;
+	}
+	
+	/**
+	 * Clear the message buffer
+	 */
+	public void clearBuffer()
+	{
+		buffer.clear();
+	}
 }

src/org/yaaic/view/ServerActivity.java

@@ -218,8 +218,10 @@ public class ServerActivity extends Activity implements ServiceConnection, Chann
 	public void onChannelMessage(String target)
 	{
 		Log.d(TAG, "Message for target " + target);
+		Channel channel = server.getChannel(target);
 		
-		Message message = server.getChannel(target).pollMessage();
+		while(channel.hasBufferedMessages()) {
+			Message message = channel.pollBufferedMessage();
 			MessageListView view = (MessageListView) deckAdapter.getItemByName(target);
 			
 			if (view != null) {
@@ -232,6 +234,7 @@ public class ServerActivity extends Activity implements ServiceConnection, Chann
 				switchedView.getAdapter().addMessage(message);
 			}
 		}
+	}
 
 	/**
 	 * On new channel