Skip to content
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

Fixes my site icon indeterminate progress #15958

Merged
merged 4 commits into from
Mar 1, 2022
Merged

Fixes my site icon indeterminate progress #15958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
294283b
fixed site icon progress bar
ParagDalvi Feb 15, 2022
a86a4ef
fixed site icon progress bar
ParagDalvi Feb 15, 2022
2d776ee
added release note
ParagDalvi Mar 1, 2022
54571f6
Merge branch 'fix/13155-indeterminate-progress-bar-in-site-icon' of h…
ParagDalvi Mar 1, 2022
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
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
-----
* [**] Login: improved error messages for login with self-hosted sites. [https://github.com/wordpress-mobile/WordPress-Android/pull/15919]
* [*] Reader: nested comments with missing parent are now hidden from the comment list [https://github.com/wordpress-mobile/WordPress-Android/pull/15993]
* [*] My Site: Fixes indeterminate progress bar in site icon when cancelling editing [https://github.com/wordpress-mobile/WordPress-Android/pull/15958]

19.3
-----
Expand Down
3 changes: 0 additions & 3 deletions WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,13 +636,10 @@ class MySiteViewModel @Inject constructor(
analyticsTrackerWrapper.track(stat)
val imageUri = Uri.parse(iconUrl)?.let { UriWrapper(it) }
if (imageUri != null) {
selectedSiteRepository.showSiteIconProgressBar(true)
launch(bgDispatcher) {
val fetchMedia = wpMediaUtilsWrapper.fetchMediaToUriWrapper(imageUri)
if (fetchMedia != null) {
_onNavigation.postValue(Event(SiteNavigationAction.OpenCropActivity(fetchMedia)))
} else {
selectedSiteRepository.showSiteIconProgressBar(false)
}
}
}
Expand Down