Skip to content

Do Not Merge – CI run for #23103 External/fix 21415 gravatar #23110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
adalpari wants to merge 10 commits into from
+14 −1
Closed

Do Not Merge – CI run for #23103 External/fix 21415 gravatar #23110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6c9999a
Fix Me tab Gravatar icon not updating on first launch
Jul 14, 2026
097023c
Merge branch 'trunk' into fix/21415-first-run-gravatar
thirumani-vihaan Jul 15, 2026
75ae278
Merge branch 'trunk' into fix/21415-first-run-gravatar
thirumani-vihaan Jul 15, 2026
2e74a41
Only refresh Gravatar on FETCH_ACCOUNT to prevent unnecessary UI updates
Jul 16, 2026
045ed9e
Merge branch 'fix/21415-first-run-gravatar' of https://github.com/thi…
Jul 16, 2026
da48dab
Merge branch 'trunk' into fix/21415-first-run-gravatar
thirumani-vihaan Jul 16, 2026
bd5899f
Fix missing AccountAction import
Jul 16, 2026
0cd2014
Merge branch 'fix/21415-first-run-gravatar' of https://github.com/thi…
Jul 16, 2026
9df2de7
Merge branch 'trunk' into fix/21415-first-run-gravatar
adalpari Jul 16, 2026
8f24f5a
Merge branch 'trunk' into external/fix-21415-gravatar
adalpari Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import org.wordpress.android.analytics.AnalyticsTracker;
import org.wordpress.android.analytics.AnalyticsTracker.Stat;
import org.wordpress.android.fluxc.Dispatcher;
import org.wordpress.android.fluxc.action.AccountAction;
import org.wordpress.android.fluxc.generated.AccountActionBuilder;
import org.wordpress.android.fluxc.generated.SiteActionBuilder;
import org.wordpress.android.fluxc.model.PostModel;
Expand Down Expand Up @@ -1466,7 +1467,12 @@ public void onAuthenticationChanged(OnAuthenticationChanged event) {
public void onAccountChanged(OnAccountChanged event) {
// Sign-out is handled in `handleSiteRemoved`, no need to show the signup flow here
if (mAccountStore.hasAccessToken()) {
if (mBottomNav != null) mBottomNav.showNoteBadge(mAccountStore.getAccount().getHasUnseenNotes());
if (mBottomNav != null) {
mBottomNav.showNoteBadge(mAccountStore.getAccount().getHasUnseenNotes());
if (event.causeOfChange == AccountAction.FETCH_ACCOUNT) {
mBottomNav.refreshGravatar();
}
}
}
}

Expand Down
7 changes: 7 additions & 0 deletions WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,13 @@ class WPMainNavigationView @JvmOverloads constructor(
showBadge(getPosition(NOTIFS), showBadge)
}

fun refreshGravatar() {
val imgIcon = getImageViewForPosition(getPosition(ME))
if (imgIcon != null) {
loadGravatar(imgIcon, accountStore.account?.avatarUrl.orEmpty())
}
}

/*
* show or hide the badge on the 'pageId' icon in the bottom bar
*/
Expand Down
Loading