aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-04-03 15:24:11 +0200
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-04-03 15:24:11 +0200
commit10f71c53c832c55e705901b75abbb03b90da4e26 (patch)
treed74ea48fc6527fb55dfbaab3fba4d50508ee8c7f
parentb91c9afe4badb9c352f71e5b7d12f7517c626482 (diff)
increased version and fixed one last null pointer
Diffstat (limited to '')
-rw-r--r--AndroidManifest.xml4
-rw-r--r--src/eu/siacs/conversations/xmpp/XmppConnection.java4
2 files changed, 6 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index de398467..ed81167a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="eu.siacs.conversations"
- android:versionCode="8"
- android:versionName="0.1.2" >
+ android:versionCode="9"
+ android:versionName="0.1.3" >
<uses-sdk
android:minSdkVersion="14"
diff --git a/src/eu/siacs/conversations/xmpp/XmppConnection.java b/src/eu/siacs/conversations/xmpp/XmppConnection.java
index 582bf9bd..1fd42bca 100644
--- a/src/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -321,6 +321,10 @@ public class XmppConnection implements Runnable {
IOException {
IqPacket packet = (IqPacket) processPacket(currentTag, PACKET_IQ);
+ if (packet.getId() == null) {
+ return; //an iq packet without id is definitely invalid
+ }
+
if (packet instanceof JinglePacket) {
if (this.jingleListener !=null) {
this.jingleListener.onJinglePacketReceived(account, (JinglePacket) packet);