XEP-0384: move label from bundle to devices

xep-0384.xml

@@ -330,16 +330,17 @@
     <section3 topic='Device list' anchor='devices'>
     <p>In order for other devices to be able to initiate a session with a given device, it first has to announce itself by adding its device id to the devicelist PEP node. </p>
     <p>It is RECOMMENDED to set the access model of the ‘urn:xmpp:omemo:1:devices’ node to ‘open’ to give entities without presence subscription read access to the devices and allow them to establish an OMEMO session. Not having presence subscription is a common occurrence on the first few messages between two contacts and can also happen fairly frequently in group chats as not every participant had prior communication with every other participant.</p>
-  <p>The access model can be changed efficiently by using publish-options.</p>
+    <p>The access model can be changed efficiently by using publish-options.</p>
+    <p>The device element MAY contain an attribute called label, which is a user defined string describing the device that published that bundle. It is RECOMMENDED to keep the length of the label under 53 characters.</p>
     <example caption='Adding the own device id to the list'><![CDATA[
 <iq from='juliet@capulet.lit' type='set' id='announce1'>
   <pubsub xmlns='http://jabber.org/protocol/pubsub'>
     <publish node='urn:xmpp:omemo:1:devices'>
       <item id='current'>
         <devices xmlns='urn:xmpp:omemo:1'>
-          <device id='12345' />
+          <device id='12345' label='Dino on Lenovo Thinkpad T495'/>
           <device id='4223' />
-          <device id='31415' />
+          <device id='31415' label='Conversations on Pixel 3' />
         </devices>
       </item>
     </publish>
@@ -361,15 +362,13 @@
     <section3 topic='Bundles' anchor='bundles'>
     <p>Furthermore, a device MUST publish its IdentityKey, a signed PreKey, and a list of PreKeys. This tuple is called a bundle and is provided by OMEMO libraries. Bundles are maintained as multiple items in a PEP node called ‘urn:xmpp:omemo:1:bundles’. Each bundle MUST be stored in a seperate item. The item id MUST be set to the device id.</p>
     <p>A bundle is an element called 'bundle' in the 'urn:xmpp:omomo:1' namespace. It has a child element called ‘spk’ that contains the public part of the signed PreKey as base64 encoded data, a child element called ‘spks’ that contains the signed PreKey signature as base64 encoded data and a child element called ‘ik’ that contains the public part of the identity key as base64 encoded data. PreKeys are multiple elements called ‘pk’ that each contain the public part of one PreKey as base64 encoded data. PreKeys are wrapped in an element called ‘prekeys’ which is a child of the bundle element.</p>
-    <p>The bundle element MAY contain an attribute called label, which is a user defined string describing the device that published that bundle.</p>
     <p>When publishing bundles a client MUST make sure that the 'urn:xmpp:omemo:1' node is configured to store multiple items. This is not the default with &xep0163;. If the node doesn’t exist yet it can be configured on the fly by using publish-options as described in <link url="https://xmpp.org/extensions/xep-0060.html#publisher-publish-options"><cite>XEP-0060</cite> §7.1.5</link>. The value for 'pubsub#max_items' in publish_options MUST be set to 'max'. If the node did exist and was configured differently the bundle publication will fail. Clients MUST then reconfigure the node as described in <link url="https://xmpp.org/extensions/xep-0060.html#owner-configure"><cite>XEP-0060</cite> §8.2</link>.</p>
     <example caption='Publishing bundle information'><![CDATA[
 <iq from='juliet@capulet.lit' type='set' id='annouce2'>
   <pubsub xmlns='http://jabber.org/protocol/pubsub'>
     <publish node='urn:xmpp:omemo:1:bundles'>
       <item id='31415'>
-        <bundle xmlns='urn:xmpp:omemo:1'
-                label='My desktop client'>
+        <bundle xmlns='urn:xmpp:omemo:1'>
           <spk id='0'>BASE64ENCODED</spk>
           <spks>BASE64ENCODED</spks>
           <ik>BASE64ENCODED</ik>