[Messaging] Fix attachment updates (JS).

Change-Id: Ib02769a60abb4ca8d410de71cc8d6e0782acda14
Signed-off-by: Pawel Andruszkiewicz <p.andruszkie@samsung.com>

diff --git a/src/messaging/messaging_api.js b/src/messaging/messaging_api.js
index 8e7a67398049378ef006a41ef04cf26d0c72e0ec..d0614826425dacd84df45095657fb1dd8b9060f3 100644 (file)
--- a/src/messaging/messaging_api.js
+++ b/src/messaging/messaging_api.js
@@ -124,7 +124,7 @@ function InternalValues_(data) {
 function updateInternal_(internal, data) {
     var values = new InternalValues_(data);
     for(var key in data) {
-        if (data.hasOwnProperty(key) && internal.hasOwnProperty(key)) {
+        if (values.hasOwnProperty(key) && internal.hasOwnProperty(key)) {
             internal[key] = values;
         }
     }
@@ -429,10 +429,18 @@ function Message(type, data) {
         {
             get: function () {return _internal.attachments;},
             set: function(value) {
-                if (value instanceof InternalValues_) value = value.attachments;
-                for (var k = 0; k < value.length; ++k) {
-                    if (!(value[k] instanceof tizen.MessageAttachment)) {
-                        return;
+                if (value instanceof InternalValues_) {
+                    value = value.attachments;
+                    for (var k = 0; k < value.length; ++k) {
+                        if (!(value[k] instanceof tizen.MessageAttachment)) {
+                            value[k] = new MessageAttachment_(value[k]);
+                        }
+                    }
+                } else {
+                    for (var k = 0; k < value.length; ++k) {
+                        if (!(value[k] instanceof tizen.MessageAttachment)) {
+                            return;
+                        }
                     }
                 }
                 _internal.attachments = value;