# HG changeset patch
# User nikita@nikita-rack
# Date 1240324730 -7200
# Node ID fc47ca00ad95cfff8d3e6cfc478ccbdf14be88d8
# Parent  666ffa5135b950ddda2c7f26cd5a98048c7f3e02# Parent  c93e4b69f031e4eceef368ac0f828288b1c85e5f
popop merge

diff -r 666ffa5135b9 -r fc47ca00ad95 AndroidManifest.xml
--- a/AndroidManifest.xml	Tue Apr 21 16:38:25 2009 +0200
+++ b/AndroidManifest.xml	Tue Apr 21 16:38:50 2009 +0200
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.beem.project.beem" android:versionCode="1"
 	android:versionName="1.0">
-	<application android:label="@string/app_name" android:name="BeemApplication" android:theme="@style/customtheme.contactList">
+	<application android:label="@string/app_name" android:name="BeemApplication" android:theme="@style/customtheme.contactList" android:icon="@drawable/logo">
 		<activity android:name=".ui.ContactList" android:label="@string/app_name">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
diff -r 666ffa5135b9 -r fc47ca00ad95 src/com/beem/project/beem/BeemService.java
--- a/src/com/beem/project/beem/BeemService.java	Tue Apr 21 16:38:25 2009 +0200
+++ b/src/com/beem/project/beem/BeemService.java	Tue Apr 21 16:38:50 2009 +0200
@@ -38,7 +38,7 @@
     /**
      * The id to use for status notification.
      */
-    public static final int NOTIFICATION_STATUS_ID = 1;
+    public static final int NOTIFICATION_STATUS_ID = 100;
 
     private NotificationManager mNotificationManager;
     private XmppConnectionAdapter mConnection;
@@ -80,7 +80,7 @@
 	mHost = "10.0.2.2";
 	initConnectionConfig();
 	mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
-	mConnection = new XmppConnectionAdapter(mConnectionConfiguration, mLogin, mPassword);
+	mConnection = new XmppConnectionAdapter(mConnectionConfiguration, mLogin, mPassword, this);
 	initRosterRequestListener();
 	mBind = new XmppFacade(mConnection, this);
     }
@@ -115,7 +115,7 @@
     public void sendNotification(int id, Notification notif) {
 	mNotificationManager.notify(id, notif);
     }
-
+    
     /**
      * Initialise la configuration de la connexion.
      */
@@ -231,7 +231,6 @@
 	    // TODO Auto-generated catch block
 	    e.printStackTrace();
 	}
-
     }
 
     /**
@@ -242,4 +241,5 @@
 	    mConnection.disconnect();
     }
 
+    
 }
diff -r 666ffa5135b9 -r fc47ca00ad95 src/com/beem/project/beem/service/BeemChatManager.java
--- a/src/com/beem/project/beem/service/BeemChatManager.java	Tue Apr 21 16:38:25 2009 +0200
+++ b/src/com/beem/project/beem/service/BeemChatManager.java	Tue Apr 21 16:38:50 2009 +0200
@@ -11,17 +11,24 @@
 import org.jivesoftware.smack.ChatManagerListener;
 import org.jivesoftware.smack.MessageListener;
 import org.jivesoftware.smack.packet.Message;
+import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smackx.ChatState;
 import org.jivesoftware.smackx.ChatStateListener;
 
+import android.R;
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.content.Intent;
 import android.os.RemoteCallbackList;
 import android.os.RemoteException;
 import android.util.Log;
 
+import com.beem.project.beem.BeemService;
 import com.beem.project.beem.service.aidl.IChat;
 import com.beem.project.beem.service.aidl.IChatManager;
 import com.beem.project.beem.service.aidl.IChatManagerListener;
 import com.beem.project.beem.service.aidl.IMessageListener;
+import com.beem.project.beem.ui.SendIM;
 
 /**
  * An adapter for smack's ChatManager. This class provides functionnality to handle chats.
@@ -36,16 +43,16 @@
     private ChatManager mAdaptee;
     private Map<String, IChat> mChats = new HashMap<String, IChat>();
     private ChatListener mChatListener = new ChatListener();
-    private RemoteCallbackList<IChatManagerListener> mRemoteChatCreationListeners =
-	new RemoteCallbackList<IChatManagerListener>();
+    private RemoteCallbackList<IChatManagerListener> mRemoteChatCreationListeners = new RemoteCallbackList<IChatManagerListener>();
     private RemoteCallbackList<IMessageListener> mRemoteMessageListeners = new RemoteCallbackList<IMessageListener>();
+    private BeemService mService;
 
     /**
      * Constructor.
      * @param chatManager the smack ChatManager to adapt
      */
-    public BeemChatManager(final ChatManager chatManager) {
-	// TODO Auto-generated constructor stub
+    public BeemChatManager(final ChatManager chatManager, BeemService service) {
+	mService = service;
 	mAdaptee = chatManager;
 	mAdaptee.addChatListener(mChatListener);
     }
@@ -58,10 +65,13 @@
      */
     public IChat createChat(String jid, IMessageListener listener) {
 	mRemoteMessageListeners.register(listener);
-	if (mChats.containsKey(jid)) {
-	    return mChats.get(jid);
+	String key = StringUtils.parseBareAddress(jid);
+	if (mChats.containsKey(key)) {
+	    return mChats.get(key);
 	}
-	return new ChatAdapter( mAdaptee.createChat(jid, mChatListener));
+	// create the chat. the adaptee will be add automatically in the map
+	mAdaptee.createChat(key, mChatListener);
+	return mChats.get(key);
     }
 
     /**
@@ -91,12 +101,24 @@
 	mRemoteChatCreationListeners.unregister(listener);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void destroyChat(IChat chat) throws RemoteException {
+	// TODO gerer les resources egalement
+	IChat c = mChats.remove(chat.getParticipant().getJID());
+	if (c == null)
+	    Log.w(TAG, "CA devrait pas 1!!");
+    }
+
     private IChat getChat(Chat chat) {
-	if (mChats.containsKey(chat.getParticipant())) {
-	    return mChats.get(chat.getParticipant());
+	String key = StringUtils.parseBareAddress(chat.getParticipant());
+	if (mChats.containsKey(key)) {
+	    return mChats.get(key);
 	}
 	IChat res = new ChatAdapter(chat);
-	mChats.put(chat.getParticipant(), res);
+	mChats.put(key, res);
 	return res;
     }
 
@@ -119,8 +141,8 @@
 	public void chatCreated(Chat chat, boolean locally) {
 	    IChat newchat = getChat(chat);
 	    if (!locally) {
-		mChats.put(chat.getParticipant(), newchat);
-		// TODO startActivity 
+		chat.addMessageListener(mChatListener);
+		notifyNewChat(newchat);
 	    }
 	    final int n = mRemoteChatCreationListeners.beginBroadcast();
 
@@ -137,22 +159,43 @@
 	    mRemoteChatCreationListeners.finishBroadcast();
 	}
 
+	private void notifyNewChat(IChat chat) {
+	    try {
+		String text = chat.getParticipant().getJID();
+		Notification notif = new Notification(com.beem.project.beem.R.drawable.logo, text, System
+		    .currentTimeMillis());
+		notif.defaults = Notification.DEFAULT_ALL;
+		notif.flags = Notification.FLAG_AUTO_CANCEL;
+		Intent intent = new Intent(mService, SendIM.class);
+		// TODO use prefix for name
+		intent.putExtra("contact", chat.getParticipant());
+		notif.setLatestEventInfo(mService, text, "nouveau message", PendingIntent.getActivity(mService, 0,
+		    intent, PendingIntent.FLAG_ONE_SHOT));
+		int id = chat.hashCode();
+		mService.sendNotification(id, notif);
+	    } catch (RemoteException e) {
+		// TODO Auto-generated catch block
+		e.printStackTrace();
+	    }
+	}
+
 	@Override
 	public void processMessage(Chat chat, Message message) {
 	    IChat newchat = getChat(chat);
-	    final int n = mRemoteMessageListeners.beginBroadcast();
-	    for (int i = 0; i < n; i++) {
-		IMessageListener listener = mRemoteMessageListeners.getBroadcastItem(i);
-		try {
+	    try {
+		newchat.addToLastMessages(message.getBody());
+		final int n = mRemoteMessageListeners.beginBroadcast();
+		for (int i = 0; i < n; i++) {
+		    IMessageListener listener = mRemoteMessageListeners.getBroadcastItem(i);
 		    listener.processMessage(newchat, new com.beem.project.beem.service.Message(message));
-		    //listener.chatCreated(newchat, locally);
-		} catch (RemoteException e) {
-		    // The RemoteCallbackList will take care of removing the
-		    // dead listeners.
-		    Log.w(TAG, "Error while triggering remote connection listeners", e);
+
 		}
+		mRemoteMessageListeners.finishBroadcast();
+	    } catch (RemoteException e) {
+		// The RemoteCallbackList will take care of removing the
+		// dead listeners.
+		Log.w(TAG, "Error while triggering remote connection listeners", e);
 	    }
-	    mRemoteMessageListeners.finishBroadcast();
 	}
 
 	@Override
diff -r 666ffa5135b9 -r fc47ca00ad95 src/com/beem/project/beem/service/ChatAdapter.java
--- a/src/com/beem/project/beem/service/ChatAdapter.java	Tue Apr 21 16:38:25 2009 +0200
+++ b/src/com/beem/project/beem/service/ChatAdapter.java	Tue Apr 21 16:38:50 2009 +0200
@@ -4,11 +4,16 @@
 package com.beem.project.beem.service;
 
 import org.jivesoftware.smack.Chat;
+import org.jivesoftware.smack.MessageListener;
 import org.jivesoftware.smack.XMPPException;
+import org.jivesoftware.smack.packet.Message;
 
+import android.os.RemoteCallbackList;
 import android.os.RemoteException;
+import android.util.Log;
 
 import com.beem.project.beem.service.aidl.IChat;
+import com.beem.project.beem.service.aidl.IMessageListener;
 
 /**
  * An adapter for smack's Chat class.
@@ -18,12 +23,14 @@
     private Chat mAdaptee;
     private Contact mParticipant;
     private String mState;
-
+    private StringBuffer mLastMessages;
+ 
     /**
      * Constructor.
      * @param chat The chat to adapt
      */
     public ChatAdapter(final Chat chat) {
+	mLastMessages = new StringBuffer();
 	mAdaptee = chat;
 	mParticipant = new Contact(chat.getParticipant());
     }
@@ -40,7 +47,7 @@
      * {@inheritDoc}
      */
     @Override
-    public void sendMessage(Message message) throws RemoteException {
+    public void sendMessage(com.beem.project.beem.service.Message message) throws RemoteException {
 	org.jivesoftware.smack.packet.Message send = new org.jivesoftware.smack.packet.Message();
 	send.setTo(message.getTo());
 	send.setBody(message.getBody());
@@ -67,4 +74,23 @@
 	mState = state;
     }
 
+    public Chat getAdaptee() {
+	return mAdaptee;
+    }
+
+    @Override
+    public String getLastMessages() throws RemoteException {
+	return mLastMessages.toString();
+    }
+
+    @Override
+    public void addToLastMessages(String msg) throws RemoteException {
+	mLastMessages.append(msg).append('\n');
+    }
+
+    @Override
+    public void clearLastMessages() throws RemoteException {
+	mLastMessages.delete(0, mLastMessages.length());
+    }
+
 }
diff -r 666ffa5135b9 -r fc47ca00ad95 src/com/beem/project/beem/service/Contact.java
--- a/src/com/beem/project/beem/service/Contact.java	Tue Apr 21 16:38:25 2009 +0200
+++ b/src/com/beem/project/beem/service/Contact.java	Tue Apr 21 16:38:50 2009 +0200
@@ -200,4 +200,11 @@
     public List<String> getMRes() {
 	return mRes;
     }
+    
+    @Override
+    public String toString() {
+	if (mJID != null)
+	    return mJID;
+	return super.toString();
+    }
 }
diff -r 666ffa5135b9 -r fc47ca00ad95 src/com/beem/project/beem/service/XmppConnectionAdapter.java
--- a/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Tue Apr 21 16:38:25 2009 +0200
+++ b/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Tue Apr 21 16:38:50 2009 +0200
@@ -16,6 +16,7 @@
 import android.os.RemoteException;
 import android.util.Log;
 import com.beem.project.beem.BeemException;
+import com.beem.project.beem.BeemService;
 import com.beem.project.beem.service.aidl.IBeemConnectionListener;
 import com.beem.project.beem.service.aidl.IChatManager;
 import com.beem.project.beem.service.aidl.IRoster;
@@ -34,6 +35,7 @@
     private String mPassword;
     private RosterAdapter mRoster;
     private Object mLastException;
+    private BeemService mService;
 
     private RemoteCallbackList<IBeemConnectionListener> mRemoteConnListeners = new RemoteCallbackList<IBeemConnectionListener>();
     private ConnexionListenerAdapter mConListener = new ConnexionListenerAdapter();
@@ -44,10 +46,11 @@
      * @param login The login to use
      * @param password The password to use
      */
-    public XmppConnectionAdapter(final XMPPConnection con, final String login, final String password) {
+    public XmppConnectionAdapter(final XMPPConnection con, final String login, final String password, BeemService service) {
 	mAdaptee = con;
 	mLogin = login;
 	mPassword = password;
+	mService = service;
     }
 
     /**
@@ -56,8 +59,8 @@
      * @param login login to use on connect
      * @param password password to use on connect
      */
-    public XmppConnectionAdapter(final String serviceName, final String login, final String password) {
-	this(new XMPPConnection(serviceName), login, password);
+    public XmppConnectionAdapter(final String serviceName, final String login, final String password, BeemService service) {
+	this(new XMPPConnection(serviceName), login, password, service);
     }
 
     /**
@@ -66,8 +69,8 @@
      * @param login login to use on connect
      * @param password password to use on connect
      */
-    public XmppConnectionAdapter(final ConnectionConfiguration config, final String login, final String password) {
-	this(new XMPPConnection(config), login, password);
+    public XmppConnectionAdapter(final ConnectionConfiguration config, final String login, final String password, BeemService service) {
+	this(new XMPPConnection(config), login, password, service);
     }
 
     /**
@@ -79,7 +82,7 @@
 	    mAdaptee.connect();
 	    mAdaptee.addConnectionListener(mConListener);
 	    mAdaptee.login(mLogin, mPassword, "BEEM");
-	    mChatManager = new BeemChatManager(mAdaptee.getChatManager());
+	    mChatManager = new BeemChatManager(mAdaptee.getChatManager(), mService);
 	    // TODO find why this cause a null pointer exception
 	    // this.initFeatures(); // pour declarer les features xmpp qu'on supporte
 	    mLastException = null;
@@ -343,4 +346,8 @@
 	return mAdaptee;
     }
     
+    public BeemService getContext() {
+	return mService;
+    }
+    
 }
diff -r 666ffa5135b9 -r fc47ca00ad95 src/com/beem/project/beem/service/aidl/IChat.aidl
--- a/src/com/beem/project/beem/service/aidl/IChat.aidl	Tue Apr 21 16:38:25 2009 +0200
+++ b/src/com/beem/project/beem/service/aidl/IChat.aidl	Tue Apr 21 16:38:50 2009 +0200
@@ -2,6 +2,7 @@
 
 import  com.beem.project.beem.service.Contact;
 import  com.beem.project.beem.service.Message;
+import  com.beem.project.beem.service.aidl.IMessageListener;
 
 /**
  * An aidl interface for Chat session.
@@ -22,5 +23,16 @@
 	
 	String getState();
 	
-	void setState(String state);
+	void setState(in String state);
+	
+	String getLastMessages();
+	
+	void addToLastMessages(in String msg);
+	
+	void clearLastMessages();
+/*	
+	void addMessageListener(in IMessageListener listener);
+	
+	void removeMessageListener(in IMessageListener listener);
+*/	
 }
\ No newline at end of file
diff -r 666ffa5135b9 -r fc47ca00ad95 src/com/beem/project/beem/service/aidl/IChatManager.aidl
--- a/src/com/beem/project/beem/service/aidl/IChatManager.aidl	Tue Apr 21 16:38:25 2009 +0200
+++ b/src/com/beem/project/beem/service/aidl/IChatManager.aidl	Tue Apr 21 16:38:50 2009 +0200
@@ -22,6 +22,12 @@
 	IChat createChat(in Contact contact, in IMessageListener listener);
 	
 	/**
+    	 * Destroy a chat session with a contact.
+    	 * @param chat	the chat session
+    	 */
+	void destroyChat(in IChat chat);
+	
+	/**
 	 * Register a callback to call when a new chat session is created.
 	 * @param listener	the callback to add
 	 */
diff -r 666ffa5135b9 -r fc47ca00ad95 src/com/beem/project/beem/ui/SendIM.java
--- a/src/com/beem/project/beem/ui/SendIM.java	Tue Apr 21 16:38:25 2009 +0200
+++ b/src/com/beem/project/beem/ui/SendIM.java	Tue Apr 21 16:38:50 2009 +0200
@@ -32,8 +32,9 @@
 import com.beem.project.beem.service.aidl.IXmppFacade;
 
 /**
- * @author barbu This activity class provides the view for instant messaging
+ * This activity class provides the view for instant messaging
  *         after selecting a correspondant.
+ * @author barbu 
  */
 
 public class SendIM extends Activity implements OnClickListener,
@@ -56,7 +57,7 @@
     private TextView mText;
     private TextView mLogin;
     private ScrollView mScrolling;
-    private Boolean mSpeak;
+    private boolean mSpeak;
 
     /**
      * Constructor.
@@ -88,16 +89,13 @@
 
 	mToSend.setOnClickListener(this);
 	mToSend.setOnKeyListener(this);
-	
-	mContact = getIntent().getParcelableExtra("contact");
-	setViewHeader();
+	mLogin = (TextView) findViewById(R.id.sendimlogin);
 	mText = (TextView) findViewById(R.id.sendimlist);
 	mScrolling = (ScrollView) findViewById(R.id.sendimscroll);
     }
     
     private void setViewHeader()
     {
-	mLogin = (TextView) findViewById(R.id.sendimlogin);
 	String status = mContact.getMsgState();
 	if (status == null)
 	    status = getString(R.string.SendIMNoStatusSet);
@@ -109,18 +107,39 @@
     @Override
     public void onStart() {
 	super.onStart();
+	//TODO cancel the notification if any
+	if (mContact == null)
+	    mContact = getIntent().getParcelableExtra("contact");
+	setViewHeader();
 	mBeemApplication.startBeemService();
 	mService = mBeemApplication.getXmppFacade();
 	try {
 	    mChatManager = mService.getChatManager();
 	    mChatManager.addChatCreationListener(mChatManagerListener);
 	    mChat = mChatManager.createChat(mContact, mMessageListener);
+	    String text = mChat.getLastMessages();
+	    if (! "".equals(text)) {
+		mText.append(text);
+		mChat.clearLastMessages(); 
+	    }
 	} catch (RemoteException e) {
 	    // TODO Auto-generated catch block
 	    e.printStackTrace();
 	}
     }
 
+    @Override
+    protected void onDestroy() {
+	super.onDestroy();
+	try {
+	    mChatManager.removeChatCreationListener(mChatManagerListener);
+	    mChatManager.destroyChat(mChat);
+	} catch (RemoteException e) {
+	    // TODO Auto-generated catch block
+	    e.printStackTrace();
+	}
+    }
+    
     /**
      * Abstract method inherited from OnClickListener
      */
@@ -134,7 +153,7 @@
      * pendant la conversation
      */
     private void sendText() {
-	if (mSpeak == null)
+	if (mSpeak)
 	    mSpeak = false;
 	String text = mToSend.getText().toString();
 	String from = mGlobalSettings.getString(
@@ -220,6 +239,8 @@
 	    Log.i("LOG", "processMessage");
 	    /*mAdapter.add(mContact.getJID() + " "
 		    + getString(R.string.SendIMSays) + msg.getBody());*/
+	    if(chat!= mChat)
+		return;
 	    
 	    final Message m = msg;
 	    mHandler.post(new Runnable() {