846708 - [Facebook] When a contact adds a picture on his facebook profile that it is not shown inmediately after updating

Status: VERIFIED FIXED

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

Description

[isabelrios]

Testrun 5.1. Test case id: #5201
Build: Gecko-411fbca.Gaia-5691a16

PROCEDURE
Import one facebook contact which does not have any profile picture but the default one.
Once it is on the address book, add a profile picture to that contact on his facebook account.
When the new picture is available on the web, then on the device go to Settings -> Update imported friends
Verify the new picture is shown on the addressbook for that contact, instead of the default profile picture

EXPECTED
The picture is correctly updated for the contact who has changed it

ACTUAL
On the addressbook the picture is still the default one. When opening the contact, the new picture is shown, but going back to contact list, the default picture is there.
It is necessary to close Contact app and then open it, to see the new picture on the contact list.

Comment 1

[Jose Manuel Cantera]

Attachment: Pointer to GH PR

Comment 2

[Cristian Rodriguez (:crdlc)]

The code is ok, I am going to test it right now

Comment 3

[Cristian Rodriguez (:crdlc)]

https://github.com/mozilla-b2g/gaia/commit/2ac5e248fe5bf69c6261d8c475e976105ca1b99b

Comment 4

[Lukas Blakk [:lsblakk] use ?needinfo]

Marking this tracking so it can be uplifted to v1-train asap, leaving the tef? nom for mvines to make the call on for v1.0.1

Comment 5

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

Uplifted commit 2ac5e248fe5bf69c6261d8c475e976105ca1b99b as:
v1-train: eb7286e7ce5dec8afebf2fa3ba3398b66291ec46

Comment 6

[Daniel Coloma:dcoloma]

Required for meeting contractual agreement with partners

Comment 7

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

There is a merge conflict when trying to uplift to v1.0.1.

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

which looks like this:

@@@ -159,9 -171,13 +159,17 @@@ contacts.List = (function()
      if (contact.category) {
        var marks = buildSocialMarks(contact.category);
        if (marks.length > 0) {
+         var meta;
          if (!contact.org || contact.org.length === 0 ||
            contact.org[0].length === 0) {
++<<<<<<< HEAD
 +          marks[0].classList.add('notorg');
++=======
+             addOrgMarkup(contactContainer);
+             meta = contactContainer.children[1];
+             contactContainer.appendChild(meta);
+             marks[0].classList.add('notorg');
++>>>>>>> eb7286e... Merge pull request #8421 from jmcanterafonseca/fix_sync_phoyo
          }
          var metaFragment = document.createDocumentFragment();
          marks.forEach(function(mark) {

The only part of that conflict that was added in the original patch is the non-conflicting var meta and "meta = contactContainer.children[1];"  I don't really know this code, so I'm not sure how to resolve this conflict.

You might be able to resolve this conflict with:

  git checkout v1-train
  git cherry-pick eb7286e7ce5dec8afebf2fa3ba3398b66291ec46
  <RESOLVE MERGE CONFLICTS>
  git commit

Comment 8

[Cristian Rodriguez (:crdlc)]

I was investigating a bit and I detected that the conflicts are due to bug 835743. There is not problem, if this one would be uplifted. Finally, if you decide that the bug 835743 shouldn't be on v1.0.1 we have to modify this patch for v1.0.1. In this case, we could have a lot conflicts  in the future uplifting from master on v1.0.1 due to contact_list file.

What should I do here?

Thanks for your help!

Comment 9

[Maria Angeles Oteo (:oteo)]

(In reply to crdlc from comment #8)
> I was investigating a bit and I detected that the conflicts are due to bug
> 835743. There is not problem, if this one would be uplifted. Finally, if you
> decide that the bug 835743 shouldn't be on v1.0.1 we have to modify this
> patch for v1.0.1. In this case, we could have a lot conflicts  in the future
> uplifting from master on v1.0.1 due to contact_list file.
> 
> What should I do here?

Bug 835743 is now tef+, so it should be uplifted to v1.0.1
Please John, uplift first 835743 in v1-train and after that do the same for 846708
It should work ;)
Thanks a lot!!

Comment 10

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

v1.0.1: cd88167e1eb661085ea426547a411170b96f5dcc

Comment 11

[mdaniloff]

Verified fixed on Unagi V.1.0.1 and V.1.1

when user changes a default picture from a facebook contact,saves new picture, and updates list, the newly added picture is correctly updated


Unagi V.1.0.1
Unagi Build ID: 20130328070202
Kernel Date: Dec 5
Gecko: http://hg.mozilla.org/releases/mozilla-b2g18_v1_0_1/rev/c516d7e67150
Gaia: d40dcdd112f12e2a5a0d1de46451670918fd4369

V.1.1
Unagi Build ID: 20130403070204
Kernel Date: Dec 5
Gecko: http://hg.mozilla.org/releases/mozilla-b2g18/rev/d467369d1b0c
Gaia: 06e0e5ce42bdfb62bdbe38271de6b5b2d9e40e75