eds: fix Android favourite handling when creating contact

When processing PersonaDetail.GROUPS before PersonaDetail.IS_FAVOURITE
while creating a new contact in EDS, the special code for adding the
contact to the “Starred in Android” group (bgo#661490 was skipped). We
must go through _set_is_favourite instead of _set_contact_is_favourite
to get that part done, too.

diff --git a/NEWS b/NEWS
index eab9855..aaac367 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ Dependencies:
 Major changes:
 
 Bugs fixed:
+• Bug 693333 - eds: creating a contact with specific groups and
+  fix "favourite" group setting for Android
 
 API changes:
 

diff --git a/backends/eds/lib/edsf-persona-store.vala b/backends/eds/lib/edsf-persona-store.vala
index 1fb875b..16503ac 100644 (file)
--- a/backends/eds/lib/edsf-persona-store.vala
+++ b/backends/eds/lib/edsf-persona-store.vala
@@ -547,7 +547,9 @@ public class Edsf.PersonaStore : Folks.PersonaStore
                   PersonaDetail.IS_FAVOURITE))
             {
               is_fav = v.get_boolean ();
-              this._set_contact_is_favourite (contact, is_fav);
+              // Use _set_is_favourite here to get the contact added
+              // to the Android "favourite" group.
+              this._set_is_favourite (contact, is_fav);
             }
         }