Increasing data sanitation in XMPPMessageArchivingCoreDataStorage

Author: robbiehanson

Extensions/XEP-0136/CoreDataStorage/XMPPMessageArchiving_Contact_CoreDataObject.m

@@ -60,11 +60,18 @@ - (void)setBareJid:(XMPPJID *)bareJid
 
 - (void)setBareJidStr:(NSString *)bareJidStr
 {
+	if ([self.bareJidStr isEqualToString:bareJidStr])
+	{
+		return; // No change
+	}
+	
 	[self willChangeValueForKey:@"bareJid"];
 	[self willChangeValueForKey:@"bareJidStr"];
 
-	self.primitiveBareJid = [XMPPJID jidWithString:bareJidStr];
-	self.primitiveBareJidStr = bareJidStr;
+	XMPPJID *bareJid = [[XMPPJID jidWithString:bareJidStr] bareJID];
+	
+	self.primitiveBareJid = bareJid;
+	self.primitiveBareJidStr = [bareJid bare];
 
 	[self didChangeValueForKey:@"bareJid"];
 	[self didChangeValueForKey:@"bareJidStr"];

Extensions/XEP-0136/CoreDataStorage/XMPPMessageArchiving_Message_CoreDataObject.m

@@ -98,10 +98,15 @@ - (XMPPJID *)bareJid
 
 - (void)setBareJid:(XMPPJID *)bareJid
 {
+	if ([self.bareJid isEqualToJID:bareJid options:XMPPJIDCompareBare])
+	{
+		return; // No change
+	}
+	
 	[self willChangeValueForKey:@"bareJid"];
 	[self willChangeValueForKey:@"bareJidStr"];
 
-	self.primitiveBareJid = bareJid;
+	self.primitiveBareJid = [bareJid bareJID];
 	self.primitiveBareJidStr = [bareJid bare];
 
 	[self didChangeValueForKey:@"bareJid"];
@@ -110,11 +115,18 @@ - (void)setBareJid:(XMPPJID *)bareJid
 
 - (void)setBareJidStr:(NSString *)bareJidStr
 {
+	if ([self.bareJidStr isEqualToString:bareJidStr])
+	{
+		return; // No change
+	}
+	
 	[self willChangeValueForKey:@"bareJid"];
 	[self willChangeValueForKey:@"bareJidStr"];
 
-	self.primitiveBareJid = [XMPPJID jidWithString:bareJidStr];
-	self.primitiveBareJidStr = bareJidStr;
+	XMPPJID *bareJid = [[XMPPJID jidWithString:bareJidStr] bareJID];
+	
+	self.primitiveBareJid = bareJid;
+	self.primitiveBareJidStr = [bareJid bare];
 
 	[self didChangeValueForKey:@"bareJid"];
 	[self didChangeValueForKey:@"bareJidStr"];