Merge pull request #331 from owncloud/fix-move-color-change

Prevent change of contact-color when changing a contacts adressbook, fix #243

1 files changed, 12 insertions, 6 deletions

diff --git a/js/services/contact_service.js b/js/services/contact_service.js
index 01cd90d0..1511027c 100644
--- a/js/services/contact_service.js
+++ b/js/services/contact_service.js
@@ -76,10 +76,15 @@ angular.module('contactsApp')
 		}
 	};
 
-	this.create = function(newContact, addressBook) {
+	this.create = function(newContact, addressBook, uid) {
 		addressBook = addressBook || AddressBookService.getDefaultAddressBook();
 		newContact = newContact || new Contact(addressBook);
-		var newUid = uuid4.generate();
+		var newUid = '';
+		if(uuid4.validate(uid)) {
+			newUid = uid;
+		} else {
+			newUid = uuid4.generate();
+		}
 		newContact.uid(newUid);
 		newContact.setUrl(addressBook, newUid);
 		newContact.addressBookId = addressBook.displayName;
@@ -125,12 +130,13 @@ angular.module('contactsApp')
 		}
 		contact.syncVCard();
 		var clone = angular.copy(contact);
+		var uid = contact.uid();
 
-		// create the contact in the new target addressbook
-		this.create(clone, addressbook);
-
-		// delete the old one
+		// delete the old one before to avoid conflict
 		this.delete(contact);
+
+		// create the contact in the new target addressbook
+		this.create(clone, addressbook, uid);
 	};
 
 	this.update = function(contact) {