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

increased version and fixed one last null pointer

This commit is contained in:
Daniel Gultsch 2014-04-03 15:24:11 +02:00
parent b91c9afe4b
commit 10f71c53c8
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="eu.siacs.conversations" package="eu.siacs.conversations"
android:versionCode="8" android:versionCode="9"
android:versionName="0.1.2" > android:versionName="0.1.3" >
<uses-sdk <uses-sdk
android:minSdkVersion="14" android:minSdkVersion="14"

4
src/eu/siacs/conversations/xmpp/XmppConnection.java
View File

@ -321,6 +321,10 @@ public class XmppConnection implements Runnable {
IOException { IOException {
IqPacket packet = (IqPacket) processPacket(currentTag, PACKET_IQ); 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 (packet instanceof JinglePacket) {
if (this.jingleListener !=null) { if (this.jingleListener !=null) {
this.jingleListener.onJinglePacketReceived(account, (JinglePacket) packet); this.jingleListener.onJinglePacketReceived(account, (JinglePacket) packet);