Store updated avatar in the bitmap cache

Author: AdamGrzybkowski

WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.kt

@@ -495,9 +495,10 @@ class MeFragment : Fragment(R.layout.me_fragment), OnScrollToTopListener {
 
     private fun MeFragmentBinding.loadAvatar(injectFilePath: String?, forceRefresh: Boolean = false) {
         val newAvatarUploaded = !injectFilePath.isNullOrEmpty()
-        val avatarUrl = meGravatarLoader.constructGravatarUrl(accountStore.account.avatarUrl, forceRefresh)
+        val avatarUrl = meGravatarLoader.constructGravatarUrl(accountStore.account.avatarUrl)
+        val newAvatarSelected = newAvatarUploaded || forceRefresh
         meGravatarLoader.load(
-            newAvatarUploaded,
+            newAvatarSelected,
             avatarUrl,
             injectFilePath,
             meAvatar,
@@ -531,7 +532,7 @@ class MeFragment : Fragment(R.layout.me_fragment), OnScrollToTopListener {
                     resource: Drawable,
                     model: Any?
                 ) {
-                    if (newAvatarUploaded && resource is BitmapDrawable) {
+                    if (newAvatarSelected && resource is BitmapDrawable) {
                         var bitmap = resource.bitmap
                         // create a copy since the original bitmap may by automatically recycled
                         bitmap = bitmap.copy(bitmap.config, true)

WordPress/src/main/java/org/wordpress/android/ui/main/utils/MeGravatarLoader.kt

@@ -20,14 +20,14 @@ class MeGravatarLoader @Inject constructor(
     private val resourseProvider: ResourceProvider
 ) {
     fun load(
-        newAvatarUploaded: Boolean,
+        newAvatarSelected: Boolean,
         avatarUrl: String,
         injectFilePath: String?,
         imageView: ImageView,
         imageType: ImageType,
         listener: RequestListener<Drawable>? = null
     ) {
-        if (newAvatarUploaded) {
+        if (newAvatarSelected) {
             // invalidate the specific gravatar entry from the bitmap cache. It will be updated via the injected
             // request cache.
             WordPress.getBitmapCache().removeSimilar(avatarUrl)
@@ -45,10 +45,12 @@ class MeGravatarLoader @Inject constructor(
             imageManager.loadIntoCircle(
                 imageView,
                 imageType,
-                if (newAvatarUploaded && injectFilePath != null) {
+                if (newAvatarSelected && injectFilePath != null) {
                     injectFilePath
                 } else {
-                    avatarUrl
+                    // If new avatar selected we force refresh the avatar
+                    val constructGravatarUrl = constructGravatarUrl(avatarUrl, newAvatarSelected)
+                    constructGravatarUrl
                 },
                 listener,
                 appPrefsWrapper.avatarVersion