+ * see https://docs.gravatar.com/general/images/
+ */
+public class WPAvatarUtils {
+ private WPAvatarUtils() {
+ throw new IllegalStateException("Utility class");
+ }
+ public static final DefaultAvatarOption DEFAULT_AVATAR = MysteryPerson.INSTANCE;
+
+ /**
+ * Remove all query params from a gravatar url and set them to the given size and
+ * default image. If the imageUrl parameters is not a gravatar link,
+ * then use Photon to resize according to the avatarSz parameter.
+ *
+ * @param imageUrl the url of the avatar image
+ * @param avatarSz the size of the avatar image
+ * @param defaultImage the default image to use if the user doesn't have a gravatar
+ * @return the fixed url
+ */
+ public static String rewriteAvatarUrl(@NonNull final String imageUrl, int avatarSz,
+ @Nullable DefaultAvatarOption defaultImage) {
+ if (TextUtils.isEmpty(imageUrl)) {
+ return "";
+ }
+
+ // if this isn't a gravatar image, return as resized photon image url
+ if (!imageUrl.contains("gravatar.com")) {
+ return PhotonUtils.getPhotonImageUrl(imageUrl, avatarSz, avatarSz);
+ } else {
+ try {
+ return new AvatarUrl(new URL(imageUrl),
+ new AvatarQueryOptions(avatarSz, defaultImage, null, null)).url().toString();
+ } catch (MalformedURLException e) {
+ return "";
+ }
+ }
+ }
+
+ public static String rewriteAvatarUrl(@NonNull final String imageUrl, int avatarSz) {
+ return rewriteAvatarUrl(imageUrl, avatarSz, DEFAULT_AVATAR);
+ }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/util/WPAvatarUtilsWrapper.kt b/WordPress/src/main/java/org/wordpress/android/util/WPAvatarUtilsWrapper.kt
new file mode 100644
index 000000000000..493cfcf30fc1
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/util/WPAvatarUtilsWrapper.kt
@@ -0,0 +1,24 @@
+package org.wordpress.android.util
+
+import android.content.Context
+import androidx.annotation.DimenRes
+import dagger.Reusable
+import javax.inject.Inject
+
+/**
+ * Injectable wrapper around GravatarUtils.
+ *
+ * WordPressAvatarUtils interface is consisted of static methods, which makes the client code difficult to test/mock.
+ * Main purpose of this wrapper is to make testing easier.
+ */
+@Reusable
+class WPAvatarUtilsWrapper @Inject constructor(private val appContext: Context) {
+ fun rewriteAvatarUrl(imageUrl: String, avatarSz: Int): String {
+ return WPAvatarUtils.rewriteAvatarUrl(imageUrl, avatarSz)
+ }
+
+ fun rewriteAvatarUrlWithResource(imageUrl: String, @DimenRes avatarSzRes: Int): String {
+ return WPAvatarUtils.rewriteAvatarUrl(imageUrl,
+ appContext.resources.getDimensionPixelSize(avatarSzRes))
+ }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/main/jetpack/migration/JetpackMigrationViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/main/jetpack/migration/JetpackMigrationViewModelTest.kt
index 984812bf8e71..6e33aee504e3 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/main/jetpack/migration/JetpackMigrationViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/main/jetpack/migration/JetpackMigrationViewModelTest.kt
@@ -40,7 +40,7 @@ import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel
import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.UiState.Loading
import org.wordpress.android.ui.prefs.AppPrefsWrapper
import org.wordpress.android.ui.utils.UiString.UiStringRes
-import org.wordpress.android.util.GravatarUtilsWrapper
+import org.wordpress.android.util.WPAvatarUtilsWrapper
import org.wordpress.android.util.JetpackMigrationLanguageUtil
import org.wordpress.android.util.LocaleManagerWrapper
import org.wordpress.android.util.SiteUtilsWrapper
@@ -54,7 +54,7 @@ class JetpackMigrationViewModelTest : BaseUnitTest() {
private val refreshAppThemeObserver: Observer1. [JP/WP] Me Screen [GravatarApi.java + StreamingRequest.java]
-
-- Go to `Me` tab.
-- From the `Me` screen you are in, click on your profile's icon (`CHANGE PHOTO`).
-- Choose an image and wait for the `Edit Photo` screen to appear.
-- Crop the image and click the `done` menu option (top right).
-- Verify the image is updated accordingly.
-
-