Переглянути джерело

omemo: specify pubsub item id of 'current'

JC Brand 4 роки тому
батько
коміт
5949d29460
3 змінених файлів з 4 додано та 3 видалено
  1. 2 2
      spec/omemo.js
  2. 1 1
      src/converse-omemo.js
  3. 1 0
      src/templates/profile_modal.js

+ 2 - 2
spec/omemo.js

@@ -833,7 +833,7 @@ describe("The OMEMO module", function() {
             `<iq from="romeo@montague.lit" id="${iq_stanza.getAttribute(`id`)}" type="set" xmlns="jabber:client">`+
                 `<pubsub xmlns="http://jabber.org/protocol/pubsub">`+
                     `<publish node="eu.siacs.conversations.axolotl.devicelist">`+
-                        `<item>`+
+                        `<item id="current">`+
                             `<list xmlns="eu.siacs.conversations.axolotl">`+
                                 `<device id="123456789"/>`+
                                 `<device id="444"/>`+
@@ -1139,7 +1139,7 @@ describe("The OMEMO module", function() {
             `<iq from="romeo@montague.lit" id="${iq_stanza.getAttribute(`id`)}" type="set" xmlns="jabber:client">`+
                 `<pubsub xmlns="http://jabber.org/protocol/pubsub">`+
                     `<publish node="eu.siacs.conversations.axolotl.devicelist">`+
-                        `<item>`+
+                        `<item id="current">`+
                             `<list xmlns="eu.siacs.conversations.axolotl">`+
                                 `<device id="482886413b977930064a5888b92134fe"/>`+
                                 `<device id="123456789"/>`+

+ 1 - 1
src/converse-omemo.js

@@ -1181,7 +1181,7 @@ converse.plugins.add('converse-omemo', {
              * See: https://xmpp.org/extensions/xep-0384.html#usecases-announcing
              */
             publishDevices () {
-                const item = $build('item').c('list', {'xmlns': Strophe.NS.OMEMO})
+                const item = $build('item', {'id': 'current'}).c('list', {'xmlns': Strophe.NS.OMEMO})
                 this.devices.filter(d => d.get('active')).forEach(d => item.c('device', {'id': d.get('id')}).up());
                 const options = {'pubsub#access_model': 'open'};
                 return api.pubsub.publish(null, Strophe.NS.OMEMO_DEVICELIST, item, options, false);

+ 1 - 0
src/templates/profile_modal.js

@@ -65,6 +65,7 @@ const device_list = (o) => {
 }
 
 
+// TODO: this needs to go as a component into the OMEMO plugin folder
 const omemo_page = (o) => {
     const i18n_fingerprint = __("This device's OMEMO fingerprint");
     const i18n_generate = __('Generate new keys and fingerprint');