Merge branch 'master' of github.com:robbiehanson/XMPPFramework

Author: robbiehanson

Extensions/XEP-0280/XMPPMessage+XEP_0280.h

@@ -0,0 +1,19 @@
+#import "XMPPMessage.h"
+@class XMPPJID;
+
+@interface XMPPMessage (XEP_0280)
+
+- (NSXMLElement *)receivedMessageCarbon;
+- (NSXMLElement *)sentMessageCarbon;
+
+- (BOOL)isMessageCarbon;
+- (BOOL)isReceivedMessageCarbon;
+- (BOOL)isSentMessageCarbon;
+- (BOOL)isTrustedMessageCarbon;
+- (BOOL)isTrustedMessageCarbonForMyJID:(XMPPJID *)jid;
+
+- (XMPPMessage *)messageCarbonForwardedMessage;
+
+- (void)addPrivateMessageCarbons;
+
+@end

Extensions/XEP-0280/XMPPMessage+XEP_0280.m

@@ -0,0 +1,118 @@
+#import "XMPPMessage+XEP_0280.h"
+#import "XMPPJID.h"
+#import "NSXMLElement+XMPP.h"
+#import "NSXMLElement+XEP_0297.h"
+
+#if ! __has_feature(objc_arc)
+#warning This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC).
+#endif
+
+#define XMLNS_XMPP_MESSAGE_CARBONS @"urn:xmpp:carbons:2"
+
+@implementation XMPPMessage (XEP_0280)
+
+- (NSXMLElement *)receivedMessageCarbon
+{
+    return [self elementForName:@"received" xmlns:XMLNS_XMPP_MESSAGE_CARBONS];
+}
+
+- (NSXMLElement *)sentMessageCarbon
+{
+    return [self elementForName:@"sent" xmlns:XMLNS_XMPP_MESSAGE_CARBONS];
+}
+
+
+- (BOOL)isMessageCarbon
+{    
+    if([self isReceivedMessageCarbon] || [self isSentMessageCarbon])
+    {
+        return YES;
+    }
+    else
+    {
+        return NO;
+    }
+}
+
+- (BOOL)isReceivedMessageCarbon
+{
+    if([self receivedMessageCarbon])
+    {
+        return YES;
+    }
+    else
+    {
+        return NO;
+    }
+}
+
+- (BOOL)isSentMessageCarbon
+{
+    if([self sentMessageCarbon])
+    {
+        return YES;
+    }
+    else
+    {
+        return NO;
+    }
+}
+
+- (BOOL)isTrustedMessageCarbon
+{
+    BOOL isTrustedMessageCarbon = NO;
+    XMPPMessage *messageCarbonForwardedMessage = [self messageCarbonForwardedMessage];
+
+    if([self isSentMessageCarbon])
+    {
+        if([[self from] isEqualToJID:[messageCarbonForwardedMessage from] options:XMPPJIDCompareBare])
+        {
+            isTrustedMessageCarbon = YES;
+        }
+
+    }
+    else if([self isReceivedMessageCarbon])
+    {
+        if([[self from] isEqualToJID:[messageCarbonForwardedMessage to] options:XMPPJIDCompareBare])
+        {
+            isTrustedMessageCarbon = YES;
+        }
+    }
+
+    return isTrustedMessageCarbon;
+}
+
+- (BOOL)isTrustedMessageCarbonForMyJID:(XMPPJID *)jid
+{
+    if([self isTrustedMessageCarbon] && [[jid bareJID] isEqualToJID:self.from])
+    {
+        return YES;
+    }
+    else
+    {
+        return NO;
+    }
+}
+
+- (XMPPMessage *)messageCarbonForwardedMessage
+{
+    NSXMLElement *carbon = nil;
+    
+    if([self receivedMessageCarbon])
+    {
+        carbon = [self receivedMessageCarbon];
+    }
+    else if([self sentMessageCarbon])
+    {
+        carbon = [self sentMessageCarbon];
+    }
+    
+    return [carbon forwardedMessage];
+}
+
+- (void)addPrivateMessageCarbons
+{
+    [self addChild:[NSXMLElement elementWithName:@"private" xmlns:XMLNS_XMPP_MESSAGE_CARBONS]];
+}
+
+@end

Extensions/XEP-0280/XMPPMessageCarbons.h

@@ -0,0 +1,65 @@
+#import "XMPPModule.h"
+@class XMPPMessage;
+@class XMPPIDTracker;
+
+#define _XMPP_MESSAGE_CARBONS_H
+
+@interface XMPPMessageCarbons : XMPPModule
+{
+    BOOL autoEnableMessageCarbons;
+    BOOL allowsUntrustedMessageCarbons;
+    BOOL messageCarbonsEnabled;
+    
+    XMPPIDTracker *xmppIDTracker;
+}
+
+/**
+ * Wether or not to automatically enable Message Carbons.
+ *
+ * Default YES
+**/
+@property (assign) BOOL autoEnableMessageCarbons;
+
+/**
+ * Wether Message Carbons is currently enabled or not.
+ *
+ * @see enableMessageCarbons
+ * @see disableMessageCarbons
+**/
+@property (assign, getter = isMessageCarbonsEnabled,readonly) BOOL messageCarbonsEnabled;
+
+/**
+ * Whether Message Carbons are validated before calling the delegate methods.
+ *
+ * @see xmppMessageCarbons:willReceiveMessage:outgoing:
+ * @see xmppMessageCarbons:didReceiveMessage:outgoing:
+ *
+ * A Message Carbon is Trusted if:
+ *
+ * - It is from the Stream's Bare JID
+ * - Sent Forward Messages are from the Stream's JID
+ * - Received Forward Messages are to the Stream's JID
+ *
+ * Default is NO
+**/
+@property (assign) BOOL allowsUntrustedMessageCarbons;
+
+/**
+ * Enable Message Carbons
+**/
+- (void)enableMessageCarbons;
+
+/**
+ * Disable Message Carbons
+**/
+- (void)disableMessageCarbons;
+
+@end
+
+@protocol XMPPMessageCarbonsDelegate <NSObject>
+
+- (void)xmppMessageCarbons:(XMPPMessageCarbons *)xmppMessageCarbons willReceiveMessage:(XMPPMessage *)message outgoing:(BOOL)isOutgoing;
+
+- (void)xmppMessageCarbons:(XMPPMessageCarbons *)xmppMessageCarbons didReceiveMessage:(XMPPMessage *)message outgoing:(BOOL)isOutgoing;
+
+@end