BEEM: comparison src/net/java/otr4j/session/SessionImpl.java

equal deleted inserted replaced

-:2ef1c6096069
+:ca323cff3ac9
 *
 * @author George Politis
 */
 public class SessionImpl implements Session {
-	/**
-	 *
-	 * @author George Politis
-	 *
-	 */
 	class TLV {
 		public TLV(int type, byte[] value) {
 			this.setType(type);
 			this.setValue(value);
 		}
 		private int type;
 		private byte[] value;
 	}
 	private SessionID sessionID;
-	private OtrEngineHost listener;
+	private OtrEngineHost host;
 	private SessionStatus sessionStatus;
 	private AuthContext authContext;
 	private SessionKeys[][] sessionKeys;
 	private Vector<byte[]> oldMacKeys;
 	private static Logger logger = Logger
 			.getLogger(SessionImpl.class.getName());
 	public SessionImpl(SessionID sessionID, OtrEngineHost listener) {
 		this.setSessionID(sessionID);
-		this.setListener(listener);
+		this.setHost(listener);
 		// client application calls OtrEngine.getSessionStatus()
 		// -> create new session if it does not exist, end up here
 		// -> setSessionStatus() fires statusChangedEvent
 		// -> client application calls OtrEngine.getSessionStatus()
 	 */
 	public SessionID getSessionID() {
 		return sessionID;
 	}
-	private void setListener(OtrEngineHost listener) {
+	private void setHost(OtrEngineHost host) {
-		this.listener = listener;
+		this.host = host;
 	}
-	private OtrEngineHost getListener() {
+	private OtrEngineHost getHost() {
-		return listener;
+		return host;
 	}
 	private SessionKeys[][] getSessionKeys() {
 		if (sessionKeys == null)
 			sessionKeys = new SessionKeys[2][2];
 		try {
 			m = SerializationUtils.toMessage(msgText);
 		} catch (IOException e) {
 			throw new OtrException(e);
 		}
+		if (m == null)
+			return msgText; // Propably null or empty.
 		switch (m.messageType) {
 		case AbstractEncodedMessage.MESSAGE_DATA:
 			return handleDataMessage((DataMessage) m);
 		case AbstractMessage.MESSAGE_ERROR:
 		logger.finest(getSessionID().getAccountID()
 				+ " received an error message from "
 				+ getSessionID().getUserID() + " throught "
 				+ getSessionID().getUserID() + ".");
-		getListener().showError(this.getSessionID(), errorMessage.error);
+		getHost().showError(this.getSessionID(), errorMessage.error);
 		OtrPolicy policy = getSessionPolicy();
 		if (policy.getErrorStartAKE()) {
 			logger.finest("Error message starts AKE.");
 			Vector<Integer> versions = new Vector<Integer>();
 			return decryptedMsgContent;
 		case FINISHED:
 		case PLAINTEXT:
-			getListener().showWarning(this.getSessionID(),
+			getHost().showWarning(this.getSessionID(),
 					"Unreadable encrypted message was received.");
 			injectMessage(new ErrorMessage(AbstractMessage.MESSAGE_ERROR,
 					"You sent me an unreadable encrypted message.."));
 			break;
 		try {
 			msg = SerializationUtils.toString(m);
 		} catch (IOException e) {
 			throw new OtrException(e);
 		}
-		getListener().injectMessage(getSessionID(), msg);
+		getHost().injectMessage(getSessionID(), msg);
 	}
 	private String handlePlainTextMessage(PlainTextMessage plainTextMessage)
 			throws OtrException {
 		logger.finest(getSessionID().getAccountID()
 			switch (this.getSessionStatus()) {
 			case ENCRYPTED:
 			case FINISHED:
 				// Display the message to the user, but warn him that the
 				// message was received unencrypted.
-				getListener().showWarning(this.getSessionID(),
+				getHost().showWarning(this.getSessionID(),
 						"The message was received unencrypted.");
 				return plainTextMessage.cleanText;
 			case PLAINTEXT:
 				// Simply display the message to the user. If
 				// REQUIRE_ENCRYPTION
 				// is set, warn him that the message was received
 				// unencrypted.
 				if (policy.getRequireEncryption()) {
-					getListener().showWarning(this.getSessionID(),
+					getHost().showWarning(this.getSessionID(),
 							"The message was received unencrypted.");
 				}
 				return plainTextMessage.cleanText;
 			}
 		} else {
 			case ENCRYPTED:
 			case FINISHED:
 				// Remove the whitespace tag and display the message to the
 				// user, but warn him that the message was received
 				// unencrypted.
-				getListener().showWarning(this.getSessionID(),
+				getHost().showWarning(this.getSessionID(),
 						"The message was received unencrypted.");
 			case PLAINTEXT:
 				// Remove the whitespace tag and display the message to the
 				// user. If REQUIRE_ENCRYPTION is set, warn him that the
 				// message
 				// was received unencrypted.
 				if (policy.getRequireEncryption())
-					getListener().showWarning(this.getSessionID(),
+					getHost().showWarning(this.getSessionID(),
 							"The message was received unencrypted.");
 			}
 			if (policy.getWhitespaceStartAKE()) {
 				logger.finest("WHITESPACE_START_AKE is set");
 			} catch (IOException e) {
 				throw new OtrException(e);
 			}
 		case FINISHED:
 			this.lastSentMessage = msgText;
-			getListener()
+			getHost()
 					.showError(
 							sessionID,
 							"Your message to "
 									+ sessionID.getUserID()
 									+ " was not sent.  Either end your private conversation, or restart it.");
 		case ENCRYPTED:
 			Vector<TLV> tlvs = new Vector<TLV>();
 			tlvs.add(new TLV(1, null));
 			String msg = this.transformSending(null, tlvs);
-			getListener().injectMessage(getSessionID(), msg);
+			getHost().injectMessage(getSessionID(), msg);
 			this.setSessionStatus(SessionStatus.PLAINTEXT);
 			break;
 		case FINISHED:
 			this.setSessionStatus(SessionStatus.PLAINTEXT);
 			break;
 	public void addOtrEngineListener(OtrEngineListener l) {
 		synchronized (listeners) {
 			if (!listeners.contains(l))
 				listeners.add(l);
 		}
 	}
 	public void removeOtrEngineListener(OtrEngineListener l) {
 		synchronized (listeners) {
 			listeners.remove(l);
 		}
 	}
 	public OtrPolicy getSessionPolicy() {
-		return getListener().getSessionPolicy(getSessionID());
+		return getHost().getSessionPolicy(getSessionID());
 	}
 	public KeyPair getLocalKeyPair() {
-		return getListener().getKeyPair(this.getSessionID());
+		return getHost().getKeyPair(this.getSessionID());
 	}
 }

changeset 911	ca323cff3ac9
parent 906	0ff0059f2ec3