846851 - [B2G][Contacts]Contacts photo and star icon dissapear from the Favorites section

Status: VERIFIED FIXED

(Firefox OS Graveyard :: Gaia::Contacts, defect)

Description

[Natalya Kot [:nkot]]

Attachment: screenshot 1

Description:
When contact is added to the favorites list it displays with its picture, but after killing Contact app and then relaunching - contact photo is gone, also a star icon

Repro Steps:
1) Updated to Unagi Build ID: 20130301070202
2) Open Contacts app
3) Create a few new contacts with names and photos
4) Select a contact to open its details screen and tap "Add As Favorite"
5) Go back to the Contacts list => contact with its photo displays in the Favorites section  - screenshot 1
6) Longpress home button and kill Contacts app
7) Relaunch Contacts app and verify contacts info - screenshot 2

Expected:
- contacts photos appear next to their names
- star icon displays at the top of the Favorites section

Actual:
- photos and star icon are gone from favorites section

Repro frequency:
100%, 3/3 devices

Environmental  Variables:
Kernel Date: Dec 5
Gecko: 69e249bf251c
Gaia: f46906e594b613571bfcc8f146d60bffd42e5a5b

*screenshots attached

Comment 1

[Natalya Kot [:nkot]]

Attachment: screenshot 2

Comment 2

[alberto.pastor]

Attachment: Pointer to Github pull request: https://github.com/mozilla-b2g/gaia/pull/8447

Pointer to Github pull-request

Comment 3

[Francisco Jordano [:arcturus] [:francisco]]

Comment on attachment 720784 [details]
Pointer to Github pull request: https://github.com/mozilla-b2g/gaia/pull/8447

Simple change, working perfectly, thanks ;)

Comment 4

[Francisco Jordano [:arcturus] [:francisco]]

Landed:

https://github.com/mozilla-b2g/gaia/commit/64ea3b586ec0b59687a682c03e902695ba07ee7b

Comment 5

[John Ford [:jhford] CET/CEST Berlin Time]

v1-train: 4cfed54b3937d9d2510ec5ca766895f5996097cd

This patch didn't apply cleanly to v1.0.1. Please try to resolve the issue with:

  cd gaia
  git checkout v1.0.1
  git cherry-pick -x 4cfed54b3937d9d2510ec5ca766895f5996097cd
  <RESOLVE MERGE CONFLICT>
  git commit

The conflict is:

#	both modified:      apps/communications/contacts/js/contacts_list.js

diff --cc apps/communications/contacts/js/contacts_list.js
index 83ae25b,8eb4923..0000000
--- a/apps/communications/contacts/js/contacts_list.js
+++ b/apps/communications/contacts/js/contacts_list.js
@@@ -412,16 -449,17 +413,19 @@@ contacts.List = (function()
            var current = contactsCache[id];
            var contact = current.contact;
            var link = current.container;
++<<<<<<< HEAD
 +          var meta = link.children[1];
 +          var favs = false;
 +          if (isFavorite(contact)) {
 +            favs = true;
 +            addToFavoriteList(link.cloneNode(true));
 +          }
++=======
++>>>>>>> 4cfed54... Merge pull request #8447 from albertopq/issue-846851
            if (fb.isFbContact(contact)) {
 -            var meta;
 -            var elements = link.querySelectorAll('p');
 -            if (elements.length == 1) {
 -              meta = addOrgMarkup(link);
 -            } else {
 -              meta = elements[1];
 -            }
              var fbContact = new fb.Contact(contact);
              contact = fbContact.merge(fbReq.result[fbContact.uid]);
 -            elements[0].innerHTML = getHighlightedName(contact);
 +            link.querySelector('p').innerHTML = getHighlightedName(contact);
              var mark = markAsFb(createSocialMark());
              var org = meta.querySelector('span.org');
              meta.insertBefore(mark, org);

Comment 6

[alberto.pastor]

You can apply the uplift from:

https://github.com/albertopq/gaia/tree/merging-846851

Regards

Comment 7

[John Ford [:jhford] CET/CEST Berlin Time]

(In reply to Alberto Pastor from comment #6)
> You can apply the uplift from:
> 
> https://github.com/albertopq/gaia/tree/merging-846851
> 
> Regards

Well, something landed on v1.0.1 which mangled your rebasing, which sucks.  But, it means that I was able to uplift the original commit cleanly.

Thanks for the rebase though!

v1.0.1: d026b071f377abda9a2b9698161dde9103266bb6

Comment 8

[mlevin]

Verified fixed on:

Unagi Build ID: 20130318070202
Kernel Date: Dec 5
Gecko: http://hg.mozilla.org/releases/mozilla-b2g18/rev/af9270e8f205
Gaia: a78ebf426840b5ef08c0cc3e437ad30aba3e2528