Moved fixAvatar routine to GravatarUtils

2 files changed, 20 insertions, 18 deletions

diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/GravatarUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/GravatarUtils.java
index 78c46088e..765084b17 100644
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/GravatarUtils.java
+++ b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/GravatarUtils.java
@@ -1,7 +1,8 @@
 package org.wordpress.android.util;
 
-public class GravatarUtils {
+import android.text.TextUtils;
 
+public class GravatarUtils {
     /*
      * see https://en.gravatar.com/site/implement/images/
      */
@@ -36,6 +37,24 @@ public class GravatarUtils {
         }
     }
 
+    /*
+    * gravatars often contain the ?s= parameter which determines their size - detect this and
+    * replace it with a new ?s= parameter which requests the avatar at the exact size needed
+    */
+    public static String fixGravatarUrl(final String imageUrl, int avatarSz) {
+        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);
+        }
+
+        // remove all other params, then add query string for size and "mystery man" default
+        return UrlUtils.removeQuery(imageUrl) + "?s=" + avatarSz + "&d=mm";
+    }
+
     public static String gravatarFromEmail(final String email, int size) {
         return gravatarFromEmail(email, size, DefaultImage.MYSTERY_MAN);
     }
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/PhotonUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/PhotonUtils.java
index fec275791..aa02d4c9d 100644
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/PhotonUtils.java
+++ b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/PhotonUtils.java
@@ -13,23 +13,6 @@ public class PhotonUtils {
     }
 
     /*
-     * gravatars often contain the ?s= parameter which determines their size - detect this and
-     * replace it with a new ?s= parameter which requests the avatar at the exact size needed
-     */
-    public static String fixAvatar(final String imageUrl, int avatarSz) {
-        if (TextUtils.isEmpty(imageUrl))
-            return "";
-
-        // if this isn't a gravatar image, return as resized photon image url
-        if (!imageUrl.contains("gravatar.com")) {
-            return getPhotonImageUrl(imageUrl, avatarSz, avatarSz);
-        }
-
-        // remove all other params, then add query string for size and "mystery man" default
-        return UrlUtils.removeQuery(imageUrl) + "?s=" + avatarSz + "&d=mm";
-    }
-
-    /*
     * returns true if the passed url is an obvious "mshots" url
     */
     public static boolean isMshotsUrl(final String imageUrl) {