BEEM-reviews: comparison src/com/beem/project/beem/service/ChatAdapter.java

equal deleted inserted replaced

-:5315a5713dd5
+:b2e1b45382a4
 President of Epitech.
 Flavien Astraud, November 26, 2009
 Head of the EIP Laboratory.
 */
 package com.beem.project.beem.service;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
+import net.java.otr4j.OtrException;
+import net.java.otr4j.session.SessionID;
 import org.jivesoftware.smack.Chat;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smackx.ChatState;
 import org.jivesoftware.smackx.ChatStateListener;
+import org.jivesoftware.smackx.ChatState;
 import android.os.Environment;
 import android.os.RemoteCallbackList;
 import android.os.RemoteException;
 import android.util.Log;
+import com.beem.project.beem.otr.BeemOtrManager;
 import com.beem.project.beem.service.aidl.IChat;
 import com.beem.project.beem.service.aidl.IMessageListener;
 /**
 * An adapter for smack's Chat class.
 * @author darisk
 */
 public class ChatAdapter extends IChat.Stub {
-private static final int HISTORY_MAX_SIZE = 50;
+	private static final int HISTORY_MAX_SIZE = 50;
-private static final String TAG = "ChatAdapter";
+	private static final String TAG = "ChatAdapter";
+	private static final String PROTOCOL = "XMPP";
-private final Chat mAdaptee;
-private final Contact mParticipant;
+	private final Chat mAdaptee;
-private String mState;
+	private final Contact mParticipant;
-private boolean mIsOpen;
+	private String mState;
-private final List<Message> mMessages;
+	private boolean mIsOpen;
-private final RemoteCallbackList<IMessageListener> mRemoteListeners = new RemoteCallbackList<IMessageListener>();
+	private final List<Message> mMessages;
-private final MsgListener mMsgListener = new MsgListener();
+	private final RemoteCallbackList<IMessageListener> mRemoteListeners = new RemoteCallbackList<IMessageListener>();
-private boolean mIsHistory;
+	private final MsgListener mMsgListener = new MsgListener();
+	private SessionID mOtrSessionId;
+	private boolean mIsHistory;
 private File mHistoryPath;
 private String mAccountUser;
 /**
-* Constructor.
+	 * Constructor.
-* @param chat The chat to adapt
+	 * @param chat The chat to adapt
-*/
+	 */
-public ChatAdapter(final Chat chat) {
+	public ChatAdapter(final Chat chat) {
-	mAdaptee = chat;
+		mAdaptee = chat;
-	mParticipant = new Contact(chat.getParticipant());
+		mParticipant = new Contact(chat.getParticipant());
-	mMessages = new LinkedList<Message>();
+		mMessages = new LinkedList<Message>();
-	mAdaptee.addMessageListener(mMsgListener);
+		mAdaptee.addMessageListener(mMsgListener);
-}
+	}
-/**
+	/**
-* {@inheritDoc}
+	 * {@inheritDoc}
-*/
+	 */
-@Override
+	@Override
-public Contact getParticipant() throws RemoteException {
+	public Contact getParticipant() throws RemoteException {
-	return mParticipant;
+		return mParticipant;
-}
+	}
 /**
 * {@inheritDoc}
 */
 @Override
 public void sendMessage(com.beem.project.beem.service.Message message) throws RemoteException {
 	org.jivesoftware.smack.packet.Message send = new org.jivesoftware.smack.packet.Message();
+	String msgBody = message.getBody();
 	send.setTo(message.getTo());
-	send.setBody(message.getBody());
+	Log.w(TAG, "message to " + message.getTo());
+		if (mOtrSessionId != null) {
+			String body;
+			try {
+				body = BeemOtrManager.getInstance().getOtrManager().transformSending(mOtrSessionId, msgBody);
+				msgBody = body;
+			} catch (OtrException e) {
+				e.printStackTrace();
+			}
+		}
+	send.setBody(msgBody);
 	send.setThread(message.getThread());
 	send.setSubject(message.getSubject());
 	send.setType(org.jivesoftware.smack.packet.Message.Type.chat);
 	// TODO gerer les messages contenant des XMPPError
 	// send.set
 	String state = Environment.getExternalStorageState();
 	if (mIsHistory && Environment.MEDIA_MOUNTED.equals(state))
 	    saveHistory(message, mAccountUser);
 }
+	public void sendMessage(String msg) {
+		Message msgToSend = new Message(mParticipant.getJIDWithRes(), Message.MSG_TYPE_CHAT);
+		msgToSend.setBody(msg);
+		try {
+			sendMessage(msgToSend);
+		} catch (RemoteException e) {
+			e.printStackTrace();
+		}
+	}
 /**
 * {@inheritDoc}
 */
 @Override
 public void addMessageListener(IMessageListener listen) {
 public void removeMessageListener(IMessageListener listen) {
 	if (listen != null) {
 	    mRemoteListeners.unregister(listen);
 	}
 }
 /**
 * {@inheritDoc}
 */
 @Override
 */
 private class MsgListener implements ChatStateListener {
 	/**
 	 * Constructor.
 	 */
-	public MsgListener() {
+	public MsgListener() { }
-	}
+		@Override
+		public void processMessage(Chat chat, org.jivesoftware.smack.packet.Message message) {
+			Message  msg = new Message(message);
+			Log.d(TAG, "new msg " + msg.getBody());
+			if (mOtrSessionId != null) {
+				String body;
+				try {
+					body = BeemOtrManager.getInstance().getOtrManager().transformReceiving(mOtrSessionId, msg.getBody());
+					msg.setBody(body);
+				} catch (OtrException e) {
+					e.printStackTrace();
+				}
+			}
+			//TODO add que les message pas de type errors
+			ChatAdapter.this.addMessage(msg);
+			final int n = mRemoteListeners.beginBroadcast();
+			for (int i = 0; i < n; i++) {
+				IMessageListener listener = mRemoteListeners.getBroadcastItem(i);
+				try {
+					if (listener != null)
+						listener.processMessage(ChatAdapter.this, msg);
+				} catch (RemoteException e) {
+					Log.w(TAG, "Error while diffusing message to listener", e);
+				}
+			}
+			mRemoteListeners.finishBroadcast();
+		}
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public void stateChanged(Chat chat, ChatState state) {
+			mState = state.name();
+			final int n = mRemoteListeners.beginBroadcast();
+			for (int i = 0; i < n; i++) {
+				IMessageListener listener = mRemoteListeners.getBroadcastItem(i);
+				try {
+					listener.stateChanged(ChatAdapter.this);
+				} catch (RemoteException e) {
+					Log.w(TAG, e.getMessage());
+				}
+			}
+			mRemoteListeners.finishBroadcast();
+		}
+	}
+	/**
+	 * This method is executed when the otr session status change.
+	 * @param otrState the new state of otr session.
+	 */
+	public	void otrStateChanged(final String otrState) {
+		final int n = mRemoteListeners.beginBroadcast();
+		if ("FINISHED".equals(otrState)) {
+			BeemOtrManager.getInstance().removeChat(mOtrSessionId);
+			mOtrSessionId = null;
+		}
+		for (int i = 0; i < n; i++) {
+			IMessageListener listener = mRemoteListeners.getBroadcastItem(i);
+			try {
+				listener.otrStateChanged(otrState);
+			} catch (RemoteException e) {
+				Log.w(TAG, e.getMessage());
+			}
+		}
+		mRemoteListeners.finishBroadcast();
+	}
 	@Override
-	public void processMessage(Chat chat, org.jivesoftware.smack.packet.Message message) {
+	public void startOtrSession() throws RemoteException {
-	    Message msg = new Message(message);
+		if (mOtrSessionId != null)
-	    //TODO add que les message pas de type errors
+			return ;
-	    ChatAdapter.this.addMessage(msg);
-	    final int n = mRemoteListeners.beginBroadcast();
+		mOtrSessionId = new SessionID(mParticipant.getJIDWithRes(), mParticipant.getJID(), PROTOCOL);
-	    for (int i = 0; i < n; i++) {
-		IMessageListener listener = mRemoteListeners.getBroadcastItem(i);
 		try {
-		    if (listener != null)
+			BeemOtrManager.getInstance().addChat(mOtrSessionId, this);
-			listener.processMessage(ChatAdapter.this, msg);
+			BeemOtrManager.getInstance().getOtrManager().startSession(mOtrSessionId);
-		} catch (RemoteException e) {
+		} catch (OtrException e) {
-		    Log.w(TAG, "Error while diffusing message to listener", e);
+			mOtrSessionId = null;
-		}
+			e.printStackTrace();
-	    }
+			throw new RemoteException();
-	    mRemoteListeners.finishBroadcast();
+		}
 	}
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
-	public void stateChanged(Chat chat, ChatState state) {
+	public void endOtrSession() throws RemoteException {
-	    mState = state.name();
+		if (mOtrSessionId == null)
-	    final int n = mRemoteListeners.beginBroadcast();
+			return ;
-	    for (int i = 0; i < n; i++) {
-		IMessageListener listener = mRemoteListeners.getBroadcastItem(i);
 		try {
-		    listener.stateChanged(ChatAdapter.this);
+			BeemOtrManager.getInstance().getOtrManager().endSession(mOtrSessionId);
-		} catch (RemoteException e) {
+		} catch (OtrException e) {
-		    Log.w(TAG, e.getMessage());
+			e.printStackTrace();
-		}
+			throw new RemoteException();
-	    }
+		}
-	    mRemoteListeners.finishBroadcast();
+		BeemOtrManager.getInstance().removeChat(mOtrSessionId);
-	}
+		mOtrSessionId = null;
-}
+	}
+	@Override
+	public void listenOtrSession() throws RemoteException {
+		if (mOtrSessionId != null)
+			return ;
+		mOtrSessionId = new SessionID(mParticipant.getJIDWithRes(), mParticipant.getJID(), PROTOCOL);
+		BeemOtrManager.getInstance().addChat(mOtrSessionId, this);
+		//OtrEngineImpl will make a call to "this.getSession(sessionID)" which will instantiate our session.
+		BeemOtrManager.getInstance().getOtrManager().getSessionStatus(mOtrSessionId);
+	}
 }

changeset 916	b2e1b45382a4
parent 862	1a0caf61fc7c
parent 915	3e4fb7a4c39f
child 918	98d8df89c3d2