From 294283b9a991475ed8d4cb74d69ebeae515c4097 Mon Sep 17 00:00:00 2001 From: Parag Dalvi Date: Tue, 15 Feb 2022 09:17:16 +0530 Subject: [PATCH 1/3] fixed site icon progress bar --- .../java/org/wordpress/android/ui/mysite/MySiteViewModel.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt index b9aa340ea2cd..06893fe79c88 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt @@ -610,13 +610,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) } } } From a86a4ef5410bd6d14f2d6ed201bdd16d2031b0a3 Mon Sep 17 00:00:00 2001 From: Parag Dalvi Date: Tue, 15 Feb 2022 09:17:16 +0530 Subject: [PATCH 2/3] fixed site icon progress bar --- .../java/org/wordpress/android/ui/mysite/MySiteViewModel.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt index 1779964ab17b..989363d63490 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt @@ -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) } } } From 2d776eebcd8d1e82374fd10bf5d1a419ad25500b Mon Sep 17 00:00:00 2001 From: Parag Dalvi Date: Tue, 1 Mar 2022 11:29:17 +0530 Subject: [PATCH 3/3] added release note --- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 45c4b841811b..ad170c0530a0 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -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 -----