sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch '2.1.x'

This commit is contained in:
Daniel Gultsch 2018-04-28 16:58:27 +02:00
parent 6dbaece149 1d51f098f2
commit 04f34fb968
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

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

4
build.gradle
View File

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

4
src/main/java/eu/siacs/conversations/parser/MessageParser.java
View File

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