fixed npe for otr sessions with non contacts

Daniel Gultsch created 11 years ago

Change summary

src/eu/siacs/conversations/entities/Conversation.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)

Detailed changes

src/eu/siacs/conversations/entities/Conversation.java

@@ -269,11 +269,15 @@ public class Conversation extends AbstractEntity {
 			return false;
 		} else {
 			String foreignPresence = this.otrSession.getSessionID().getUserID();
-			if (!getContact().getPresences().containsKey(foreignPresence)) {
-				this.resetOtrSession();
-				return false;
+			if (getContact()==null) {
+				return true;
+			} else {
+				if (!getContact().getPresences().containsKey(foreignPresence)) {
+					this.resetOtrSession();
+					return false;
+				}
+				return true;
 			}
-			return true;
 		}
 	}