1 files changed, 15 insertions, 14 deletions
diff --git a/SmartDeviceLink/private/SDLTextAndGraphicUpdateOperation.m b/SmartDeviceLink/private/SDLTextAndGraphicUpdateOperation.m
index a2479570b..6f0680581 100644
--- a/SmartDeviceLink/private/SDLTextAndGraphicUpdateOperation.m
+++ b/SmartDeviceLink/private/SDLTextAndGraphicUpdateOperation.m
@@ -100,20 +100,21 @@ NSString *const SDLTextAndGraphicFailedScreenStateErrorKey = @"failedScreenState
 }
 
 - (void)updateTargetStateWithErrorState:(SDLTextAndGraphicState *)errorState {
-    self.updatedState.textField1 = (errorState.textField1 == self.updatedState.textField1) ? self.currentScreenData.textField1 : self.updatedState.textField1;
-    self.updatedState.textField2 = (errorState.textField2 == self.updatedState.textField2) ? self.currentScreenData.textField2 : self.updatedState.textField2;
-    self.updatedState.textField3 = (errorState.textField3 == self.updatedState.textField3) ? self.currentScreenData.textField3 : self.updatedState.textField3;
-    self.updatedState.textField4 = (errorState.textField4 == self.updatedState.textField4) ? self.currentScreenData.textField4 : self.updatedState.textField4;
-    self.updatedState.mediaTrackTextField = (errorState.mediaTrackTextField == self.updatedState.mediaTrackTextField) ? self.currentScreenData.mediaTrackTextField : self.updatedState.mediaTrackTextField;
-    self.updatedState.title = (errorState.title == self.updatedState.title) ? self.currentScreenData.title : self.updatedState.title;
-    self.updatedState.primaryGraphic = (errorState.primaryGraphic == self.updatedState.primaryGraphic) ? self.currentScreenData.primaryGraphic : self.updatedState.primaryGraphic;
-    self.updatedState.secondaryGraphic = (errorState.secondaryGraphic == self.updatedState.secondaryGraphic) ? self.currentScreenData.secondaryGraphic : self.updatedState.secondaryGraphic;
-    self.updatedState.alignment = (errorState.alignment == self.updatedState.alignment) ? self.currentScreenData.alignment : self.updatedState.alignment;
-    self.updatedState.textField1Type = (errorState.textField1Type == self.updatedState.textField1Type) ? self.currentScreenData.textField1Type : self.updatedState.textField1Type;
-    self.updatedState.textField2Type = (errorState.textField2Type == self.updatedState.textField2Type) ? self.currentScreenData.textField2Type : self.updatedState.textField2Type;
-    self.updatedState.textField3Type = (errorState.textField3Type == self.updatedState.textField3Type) ? self.currentScreenData.textField3Type : self.updatedState.textField3Type;
-    self.updatedState.textField4Type = (errorState.textField4Type == self.updatedState.textField4Type) ? self.currentScreenData.textField4Type : self.updatedState.textField4Type;
-    self.updatedState.templateConfig = (errorState.templateConfig == self.updatedState.templateConfig) ? self.currentScreenData.templateConfig : self.updatedState.templateConfig;
+    self.updatedState.textField1 = [errorState.textField1 isEqualToString:self.updatedState.textField1] ? self.currentScreenData.textField1 : self.updatedState.textField1;
+    self.updatedState.textField2 = [errorState.textField2 isEqualToString:self.updatedState.textField2] ? self.currentScreenData.textField2 : self.updatedState.textField2;
+    self.updatedState.textField3 = [errorState.textField3 isEqualToString:self.updatedState.textField3] ? self.currentScreenData.textField3 : self.updatedState.textField3;
+    self.updatedState.textField4 = [errorState.textField4 isEqualToString:self.updatedState.textField4] ? self.currentScreenData.textField4 : self.updatedState.textField4;
+    self.updatedState.mediaTrackTextField = [errorState.mediaTrackTextField isEqualToString:self.updatedState.mediaTrackTextField] ? self.currentScreenData.mediaTrackTextField : self.updatedState.mediaTrackTextField;
+    self.updatedState.title = [errorState.title isEqualToString:self.updatedState.title] ? self.currentScreenData.title : self.updatedState.title;
+    self.updatedState.primaryGraphic = [errorState.primaryGraphic isEqual:self.updatedState.primaryGraphic] ? self.currentScreenData.primaryGraphic : self.updatedState.primaryGraphic;
+    [errorState.primaryGraphic isEqual:self.updatedState.primaryGraphic];
+    self.updatedState.secondaryGraphic = [errorState.secondaryGraphic isEqual:self.updatedState.secondaryGraphic] ? self.currentScreenData.secondaryGraphic : self.updatedState.secondaryGraphic;
+    self.updatedState.alignment = [errorState.alignment isEqualToEnum:self.updatedState.alignment] ? self.currentScreenData.alignment : self.updatedState.alignment;
+    self.updatedState.textField1Type = [errorState.textField1Type isEqualToEnum:self.updatedState.textField1Type] ? self.currentScreenData.textField1Type : self.updatedState.textField1Type;
+    self.updatedState.textField2Type = [errorState.textField2Type isEqualToEnum:self.updatedState.textField2Type] ? self.currentScreenData.textField2Type : self.updatedState.textField2Type;
+    self.updatedState.textField3Type = [errorState.textField3Type isEqualToEnum:self.updatedState.textField3Type] ? self.currentScreenData.textField3Type : self.updatedState.textField3Type;
+    self.updatedState.textField4Type = [errorState.textField4Type isEqualToEnum:self.updatedState.textField4Type] ? self.currentScreenData.textField4Type : self.updatedState.textField4Type;
+    self.updatedState.templateConfig = [errorState.templateConfig isEqual:self.updatedState.templateConfig] ? self.currentScreenData.templateConfig : self.updatedState.templateConfig;
 }
 
 #pragma mark - Send Show / Set Display Layout