increased version and fixed one last null pointer

Daniel Gultsch created 12 years ago

Change summary

AndroidManifest.xml                                 | 4 ++--
src/eu/siacs/conversations/xmpp/XmppConnection.java | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)

Detailed changes

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"

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);