trifork · wnatrifork · Apr 7, 2025 · Apr 7, 2025 · Jun 5, 2025 · Jul 23, 2025
diff --git a/Extensions/OMEMO/NSXMLElement+OMEMO.h b/Extensions/OMEMO/NSXMLElement+OMEMO.h
@@ -55,10 +55,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 
 /** Extracts device list from PEP <items> element */
-- (nullable NSArray<NSNumber *>*)omemo_deviceListFromItems:(OMEMOModuleNamespace)ns;
+- (nullable NSArray<NSNumber *>*)omemo_deviceListFromItems;
 /** Extracts device list from PEP iq respnse */
-- (nullable NSArray<NSNumber *>*)omemo_deviceListFromIqResponse:(OMEMOModuleNamespace)ns;
-
+- (nullable NSArray<NSNumber *>*)omemo_deviceListFromIqResponse;
 
 @end
 NS_ASSUME_NONNULL_END
diff --git a/Extensions/OMEMO/NSXMLElement+OMEMO.m b/Extensions/OMEMO/NSXMLElement+OMEMO.m
@@ -110,27 +110,27 @@ + (NSXMLElement*) omemo_keyTransportElementWithKeyData:(NSArray<OMEMOKeyData*>*)
 }
 
 /*
- <iq xmlns="jabber:client" id="AEA43C1D-DA7D-448F-8F41-268D1A14FF3F" type="result" to="[email protected]/b9038fb3-0575-47bf-b8bb-cd1073f972c6" from="[email protected]">
-    <pubsub xmlns="http://jabber.org/protocol/pubsub">
-        <items node="eu.siacs.conversations.axolotl.devicelist">
-            <item id="1">
-                <list xmlns="eu.siacs.conversations.axolotl">
-                    <device id="1259777401"/>
-                </list>
-            </item>
-        </items>
-    </pubsub>
+ <iq from="[email protected]" id="AEA43C1D-DA7D-448F-8F41-268D1A14FF3F" to="[email protected]/b9038fb3-0575-47bf-b8bb-cd1073f972c6" type="result" xmlns="jabber:client">
+     <pubsub xmlns="http://jabber.org/protocol/pubsub">
+         <items node="urn:xmpp:omemo:2:devices">
+             <item id="current">
+                 <devices xmlns="urn:xmpp:omemo:2">
+                     <device id="1259777401"/>
+                 </devices>
+             </item>
+         </items>
+     </pubsub>
  </iq>
  */
-- (nullable NSArray<NSNumber *>*)omemo_deviceListFromIqResponse:(OMEMOModuleNamespace)ns {
+- (nullable NSArray<NSNumber *>*)omemo_deviceListFromIqResponse {
     NSXMLElement *pubsub = [self elementForName:@"pubsub" xmlns:XMLNS_PUBSUB];
     NSXMLElement *items = [pubsub elementForName:@"items"];
-    return [items omemo_deviceListFromItems:ns];
+    return [items omemo_deviceListFromItems];
 }
 
-- (nullable NSArray<NSNumber *>*)omemo_deviceListFromItems:(OMEMOModuleNamespace)ns {
-    if ([[self attributeStringValueForName:@"node"] isEqualToString:[OMEMOModule xmlnsOMEMODeviceList:ns]]) {
-        NSXMLElement * devicesList = [[self elementForName:@"item"] elementForName:@"list" xmlns:[OMEMOModule xmlnsOMEMO:ns]];
+- (nullable NSArray<NSNumber *>*)omemo_deviceListFromItems {
+    if ([[self attributeStringValueForName:@"node"] isEqualToString:[OMEMOModule xmlnsOMEMODeviceList]]) {
+        NSXMLElement * devicesList = [[self elementForName:@"item"] elementForName:@"devices" xmlns:[OMEMOModule xmlnsOMEMO]];
         if (devicesList) {
             NSArray *children = [devicesList children];
             NSMutableArray *result = [[NSMutableArray alloc] initWithCapacity:children.count];

diff --git a/Extensions/OMEMO/OMEMOModule.h b/Extensions/OMEMO/OMEMOModule.h
@@ -137,11 +137,12 @@ typedef NS_ENUM(NSUInteger, OMEMOModuleNamespace) {
 
 #pragma mark Namespace methods
 
-+ (NSString*) xmlnsOMEMO:(OMEMOModuleNamespace)ns;
-+ (NSString*) xmlnsOMEMODeviceList:(OMEMOModuleNamespace)ns;
-+ (NSString*) xmlnsOMEMODeviceListNotify:(OMEMOModuleNamespace)ns;
-+ (NSString*) xmlnsOMEMOBundles:(OMEMOModuleNamespace)ns;
-+ (NSString*) xmlnsOMEMOBundles:(OMEMOModuleNamespace)ns deviceId:(uint32_t)deviceId;
++ (NSString*) xmlnsOMEMO;
++ (NSString*) xmlnsOMEMODeviceList;
++ (NSString*) xmlnsOMEMODeviceListNotify;
++ (NSString*) xmlnsOMEMOBundles;
+
++ (NSString*) xmlnsOMEMO:(OMEMOModuleNamespace)ns __attribute__((deprecated("Use xmlnsOMEMO instead")));
 
 @end
 

diff --git a/Extensions/OMEMO/OMEMOModule.m b/Extensions/OMEMO/OMEMOModule.m
@@ -88,7 +88,7 @@ - (void) publishDeviceIds:(NSArray<NSNumber*>*)deviceIds elementId:(nullable NSS
     __weak id weakMulticast = multicastDelegate;
     [self performBlock:^{
         NSString *eid = [self fixElementId:elementId];
-        XMPPIQ *iq = [XMPPIQ omemo_iqPublishDeviceIds:deviceIds elementId:eid xmlNamespace:self.xmlNamespace];
+        XMPPIQ *iq = [XMPPIQ omemo_iqPublishDeviceIds:deviceIds elementId:eid];
         [self.tracker addElement:iq block:^(XMPPIQ *responseIq, id<XMPPTrackingInfo> info) {
             __typeof__(self) strongSelf = weakSelf;
             if (!strongSelf) { return; }
@@ -119,7 +119,7 @@ - (void) fetchDeviceIdsForJID:(XMPPJID*)jid
             return;
         }
 
-        NSArray<NSNumber *> *devices = [responseIq omemo_deviceListFromIqResponse:self.xmlNamespace];
+        NSArray<NSNumber *> *devices = [responseIq omemo_deviceListFromIqResponse];
         if (!devices) {
             devices = @[];
             XMPPLogWarn(@"Missing devices from element: %@ %@", info.element, responseIq);
@@ -141,7 +141,7 @@ - (void) fetchDeviceIdsForJID:(nonnull XMPPJID*)jid
                    completion:(void (^_Nonnull)(XMPPIQ *responseIq, id<XMPPTrackingInfo> info))completion {
     [self performBlock:^{
         NSString *eid = [self fixElementId:elementId];
-        XMPPIQ *iq = [XMPPIQ omemo_iqFetchDeviceIdsForJID:jid elementId:eid xmlNamespace:self.xmlNamespace];
+        XMPPIQ *iq = [XMPPIQ omemo_iqFetchDeviceIdsForJID:jid elementId:eid];
         [self.tracker addElement:iq block:completion timeout:30];
         [self->xmppStream sendElement:iq];
     }];
@@ -155,7 +155,7 @@ - (void) publishBundle:(OMEMOBundle*)bundle
     __weak id weakMulticast = multicastDelegate;
     [self performBlock:^{
         NSString *eid = [self fixElementId:elementId];
-        XMPPIQ *iq = [XMPPIQ omemo_iqPublishBundle:bundle elementId:eid xmlNamespace:self.xmlNamespace];
+        XMPPIQ *iq = [XMPPIQ omemo_iqPublishBundle:bundle elementId:eid];
         [self.tracker addElement:iq block:^(XMPPIQ *responseIq, id<XMPPTrackingInfo> info) {
             __typeof__(self) strongSelf = weakSelf;
             if (!strongSelf) { return; }
@@ -181,7 +181,7 @@ - (void) fetchBundleForDeviceId:(uint32_t)deviceId
     __weak id weakMulticast = multicastDelegate;
     [self performBlock:^{
         NSString *eid = [self fixElementId:elementId];
-        XMPPIQ *iq = [XMPPIQ omemo_iqFetchBundleForDeviceId:deviceId jid:jid.bareJID elementId:eid xmlNamespace:self.xmlNamespace];
+        XMPPIQ *iq = [XMPPIQ omemo_iqFetchBundleForDeviceId:deviceId jid:jid.bareJID elementId:eid];
         [self.tracker addElement:iq block:^(XMPPIQ *responseIq, id<XMPPTrackingInfo> info) {
             __typeof__(self) strongSelf = weakSelf;
             if (!strongSelf) { return; }
@@ -191,7 +191,7 @@ - (void) fetchBundleForDeviceId:(uint32_t)deviceId
                 [weakMulticast omemo:strongSelf failedToFetchBundleForDeviceId:deviceId fromJID:jid errorIq:responseIq outgoingIq:iq];
                 return;
             }
-            OMEMOBundle *bundle = [responseIq omemo_bundle:strongSelf.xmlNamespace];
+            OMEMOBundle *bundle = [responseIq omemo_bundle];
             if (bundle) {
                 [weakMulticast omemo:strongSelf fetchedBundle:bundle fromJID:jid responseIq:responseIq outgoingIq:iq];
             } else {
@@ -218,7 +218,7 @@ - (void) removeDeviceIds:(NSArray<NSNumber*>*)deviceIds elementId:(NSString *)el
                 return;
             }
 
-            NSArray<NSNumber *> *devices = [responseIq omemo_deviceListFromIqResponse:strongSelf.xmlNamespace];
+            NSArray<NSNumber *> *devices = [responseIq omemo_deviceListFromIqResponse];
             NSIndexSet *indexSet = [devices indexesOfObjectsPassingTest:^BOOL(NSNumber * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
                 return [deviceIds containsObject:obj];
             }];
@@ -277,7 +277,7 @@ - (void) receiveMessage:(XMPPMessage*)message forJID:(XMPPJID*)forJID isIncoming
         return;
     }
     // Check for incoming device list updates
-    NSArray<NSNumber *> *deviceIds = [message omemo_deviceListFromPEPUpdate:self.xmlNamespace];
+    NSArray<NSNumber *> *deviceIds = [message omemo_deviceListFromPEPUpdate];
     XMPPJID *bareJID = forJID.bareJID;
     if (deviceIds && message == originalMessage) {
         [multicastDelegate omemo:self deviceListUpdate:deviceIds fromJID:bareJID incomingElement:message];
@@ -301,37 +301,28 @@ - (void) receiveMessage:(XMPPMessage*)message forJID:(XMPPJID*)forJID isIncoming
 
 #pragma mark Namespace methods
 
-+ (NSString*) xmlnsOMEMO:(OMEMOModuleNamespace)ns {
-    if (ns == OMEMOModuleNamespaceOMEMO) {
-        return @"urn:xmpp:omemo:0";
-    } else { // OMEMOModuleNamespaceConversationsLegacy
-        return @"eu.siacs.conversations.axolotl";
-    }
++ (NSString*) xmlnsOMEMO {
+    return @"urn:xmpp:omemo:2";
 }
-+ (NSString*) xmlnsOMEMODeviceList:(OMEMOModuleNamespace)ns {
-    NSString *xmlns = [self xmlnsOMEMO:ns];
-    if (ns == OMEMOModuleNamespaceOMEMO) {
-        return [NSString stringWithFormat:@"%@:devicelist", xmlns];
-    } else { // OMEMOModuleNamespaceConversationsLegacy
-        return [NSString stringWithFormat:@"%@.devicelist", xmlns];
-    }
+
++ (NSString*) xmlnsOMEMODeviceList {
+    return [NSString stringWithFormat:@"%@:devices", [self xmlnsOMEMO]];
 }
-+ (NSString*) xmlnsOMEMODeviceListNotify:(OMEMOModuleNamespace)ns {
-    return [NSString stringWithFormat:@"%@+notify", [self xmlnsOMEMODeviceList:ns]];
+
++ (NSString*) xmlnsOMEMODeviceListNotify {
+    return [NSString stringWithFormat:@"%@+notify", [self xmlnsOMEMODeviceList]];
+}
+
++ (NSString*) xmlnsOMEMOBundles {
+    return [NSString stringWithFormat:@"%@:bundles", [self xmlnsOMEMO]];
 }
-+ (NSString*) xmlnsOMEMOBundles:(OMEMOModuleNamespace)ns {
-    NSString *xmlns = [self xmlnsOMEMO:ns];
+
++ (NSString*) xmlnsOMEMO:(OMEMOModuleNamespace)ns {
     if (ns == OMEMOModuleNamespaceOMEMO) {
-        xmlns = [NSString stringWithFormat:@"%@:bundles", xmlns];
+        return @"urn:xmpp:omemo:0";
     } else { // OMEMOModuleNamespaceConversationsLegacy
-        xmlns = [NSString stringWithFormat:@"%@.bundles", xmlns];
+        return @"eu.siacs.conversations.axolotl";
     }
-    NSParameterAssert(xmlns != nil);
-    return xmlns;
-}
-
-+ (NSString*) xmlnsOMEMOBundles:(OMEMOModuleNamespace)ns deviceId:(uint32_t)deviceId {
-    return [NSString stringWithFormat:@"%@:%d", [self xmlnsOMEMOBundles:ns], (int)deviceId];
 }
 
 #pragma mark XMPPStreamDelegate methods
@@ -395,7 +386,7 @@ - (BOOL)xmppStream:(XMPPStream *)sender didReceiveIQ:(XMPPIQ *)iq {
 #pragma mark XMPPCapabilitiesDelegate methods
 
 - (NSArray<NSString*>*) myFeaturesForXMPPCapabilities:(XMPPCapabilities *)sender {
-    return @[[[self class] xmlnsOMEMODeviceList:self.xmlNamespace], [[self class] xmlnsOMEMODeviceListNotify:self.xmlNamespace]];
+    return @[[[self class] xmlnsOMEMODeviceList], [[self class] xmlnsOMEMODeviceListNotify]];
 }
 
 #pragma mark Utility

diff --git a/Extensions/OMEMO/XMPPIQ+OMEMO.h b/Extensions/OMEMO/XMPPIQ+OMEMO.h
@@ -19,27 +19,23 @@ NS_ASSUME_NONNULL_BEGIN
 
 /** iq stanza for manually fetching deviceIds list. This should be handled automatically by PEP. */
 + (XMPPIQ*) omemo_iqFetchDeviceIdsForJID:(XMPPJID*)jid
-                               elementId:(nullable NSString*)elementId
-                            xmlNamespace:(OMEMOModuleNamespace)xmlNamespace;
+                               elementId:(nullable NSString*)elementId;
 
 /** iq stanza for publishing your device ids. The Device IDs are integers between 1 and 2^31 - 1 */
 + (XMPPIQ*) omemo_iqPublishDeviceIds:(NSArray<NSNumber*>*)deviceIds
-                       elementId:(nullable NSString*)elementId
-                        xmlNamespace:(OMEMOModuleNamespace)xmlNamespace;
+                       elementId:(nullable NSString*)elementId;
 
 /** iq stanza for publishing bundle for device */
 + (XMPPIQ*) omemo_iqPublishBundle:(OMEMOBundle*)bundle
-                 elementId:(nullable NSString*)elementId
-                     xmlNamespace:(OMEMOModuleNamespace)xmlNamespace;
+                 elementId:(nullable NSString*)elementId;
 
 /** iq stanza for fetching remote bundle */
 + (XMPPIQ*) omemo_iqFetchBundleForDeviceId:(uint32_t)deviceId
                                        jid:(XMPPJID*)jid
-                                 elementId:(nullable NSString*)elementId
-                              xmlNamespace:(OMEMOModuleNamespace)xmlNamespace;
+                                 elementId:(nullable NSString*)elementId;
 
 /** Serialize bundle from IQ */
-- (nullable OMEMOBundle*) omemo_bundle:(OMEMOModuleNamespace)ns;
+- (nullable OMEMOBundle*) omemo_bundle;
 
 @end
 NS_ASSUME_NONNULL_END