Merge branch '2.1.x'

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### Version 2.1.4
+* bug fixes
+
 ### Version 2.1.3
 * Do not process stanzas with invalid JIDs
 

build.gradle

@@ -66,8 +66,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 25
-        versionCode 267
-        versionName "2.1.3"
+        versionCode 268
+        versionName "2.1.4"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId

src/main/java/eu/siacs/conversations/parser/MessageParser.java

@@ -293,8 +293,8 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
 		}
 		boolean notify = false;
 
-		if (from == null) {
-			Log.d(Config.LOGTAG, "no from in: " + packet.toString());
+		if (from == null || !InvalidJid.isValid(from) || !InvalidJid.isValid(to)) {
+			Log.e(Config.LOGTAG, "encountered invalid message from='" + from + "' to='" + to + "'");
 			return;
 		}