From 4ed43854bdcec6b9481358f2c6aed4d6f9d20785 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Sat, 18 Aug 2018 18:25:38 +0200
Subject: [PATCH] Bugfix. Items need to go inside the list

---
 spec/omemo.js         | 14 ++++++++------
 src/converse-omemo.js |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/spec/omemo.js b/spec/omemo.js
index ccb5d8074..80487f133 100644
--- a/spec/omemo.js
+++ b/spec/omemo.js
@@ -360,9 +360,10 @@
                         '<pubsub xmlns="http://jabber.org/protocol/pubsub">'+
                             '<publish node="eu.siacs.conversations.axolotl.devicelist">'+
                                 '<item>'+
-                                    '<list xmlns="eu.siacs.conversations.axolotl"/>'+
-                                    '<device id="123456789"/>'+
-                                    '<device id="444"/>'+
+                                    '<list xmlns="eu.siacs.conversations.axolotl">'+
+                                        '<device id="123456789"/>'+
+                                        '<device id="444"/>'+
+                                    '</list>'+
                                 '</item>'+
                             '</publish>'+
                         '</pubsub>'+
@@ -669,9 +670,10 @@
                         '<pubsub xmlns="http://jabber.org/protocol/pubsub">'+
                             '<publish node="eu.siacs.conversations.axolotl.devicelist">'+
                                 '<item>'+
-                                    '<list xmlns="eu.siacs.conversations.axolotl"/>'+
-                                    '<device id="482886413b977930064a5888b92134fe"/>'+
-                                    '<device id="123456789"/>'+
+                                    '<list xmlns="eu.siacs.conversations.axolotl">'+
+                                        '<device id="482886413b977930064a5888b92134fe"/>'+
+                                        '<device id="123456789"/>'+
+                                    '</list>'+
                                 '</item>'+
                             '</publish>'+
                     '</pubsub>'+
diff --git a/src/converse-omemo.js b/src/converse-omemo.js
index 26072af6c..14cf80894 100644
--- a/src/converse-omemo.js
+++ b/src/converse-omemo.js
@@ -734,7 +734,7 @@
                         }).c('pubsub', {'xmlns': Strophe.NS.PUBSUB})
                             .c('publish', {'node': Strophe.NS.OMEMO_DEVICELIST})
                                 .c('item')
-                                    .c('list', {'xmlns': Strophe.NS.OMEMO}).up()
+                                    .c('list', {'xmlns': Strophe.NS.OMEMO})
 
                         _.each(this.devices.where({'active': true}), (device) => {
                             stanza.c('device', {'id': device.get('id')}).up();