1312719 - Sync account avatar still visible after disconnect/logout

Status: RESOLVED FIXED

(Firefox for Android Graveyard :: Firefox Accounts, defect, P2)

Description

[Sebastian Kaspari (:sebastian; :pocmo)]

Attachment: settings-logout.png

After selecting "disconnect" on the account settings page and returning to settings the avatar from the account is still visible (See screenshot). The next time I open settings the default avatar is shown again.

Comment 1

[Max Liu [:maliu]]

Attachment: Bug 1312719 - Clear icon by setIcon with null drawable before setIcon with resId,

Review commit: https://reviewboard.mozilla.org/r/90898/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/90898/

Comment 2

[Sebastian Kaspari (:sebastian; :pocmo)]

Comment on attachment 8807978 [details]
Bug 1312719 - Clear icon by setIcon with null drawable before setIcon with resId,

https://reviewboard.mozilla.org/r/90898/#review90876

::: mobile/android/base/java/org/mozilla/gecko/preferences/SyncPreference.java:58
(Diff revision 1)
> +                        // Bug 1312719 - IconDrawable is prior to IconResId, drawable must be set null before setIcon(resId)
> +                        // http://androidxref.com/5.1.1_r6/xref/frameworks/base/core/java/android/preference/Preference.java#102
> +                        setIcon(null);
>                          setIcon(R.drawable.sync_avatar_default);

This is weird - but it works. Do you know why? Doesn't setIcon(int) call setIcon(Drawable)?

Comment 3

[Max Liu [:maliu]]

Because in bindView, iconRes will take effect only when iconDrawable is null.

Maybe I should update the link to following line?
http://androidxref.com/5.1.1_r6/xref/frameworks/base/core/java/android/preference/Preference.java#562

Comment 4

[Max Liu [:maliu]]

Comment on attachment 8807978 [details]
Bug 1312719 - Clear icon by setIcon with null drawable before setIcon with resId,

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/90898/diff/1-2/

Comment 5

[Sebastian Kaspari (:sebastian; :pocmo)]

(In reply to Max Liu [:maliu] from comment #3)
> Because in bindView, iconRes will take effect only when iconDrawable is null.
> 
> Maybe I should update the link to following line?
> http://androidxref.com/5.1.1_r6/xref/frameworks/base/core/java/android/
> preference/Preference.java#562

Yeah, and/or add a comment mentioning that the new icon resource will only be loaded if no icon is set.

As this patch is already reviewed: Just add the 'checkin-needed' keyword to the bug and a sheriff will land the patch. :)

Comment 6

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/a14ca8dbcc4b
Clear icon by setIcon with null drawable before setIcon with resId, r=sebastian

Comment 7

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/a14ca8dbcc4b