Update Gravatar to 2.0.0

Author: AdamGrzybkowski

WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginHeaderViewHolder.java

@@ -115,7 +115,10 @@ private int getAvatarSize(Context context) {
         }
         return new AvatarUrl(
                 new Email(site.getEmail()),
-                new AvatarQueryOptions(getAvatarSize(context), DefaultAvatarOption.Status404.INSTANCE, null, null)
-        ).url().toString();
+                new AvatarQueryOptions.Builder()
+                        .setPreferredSize(getAvatarSize(context))
+                        .setDefaultAvatarOption(DefaultAvatarOption.Status404.INSTANCE)
+                        .build()
+        ).url(null).toString();
     }
 }

WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.kt

@@ -31,7 +31,7 @@ import androidx.core.widget.NestedScrollView
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.gravatar.services.AvatarService
-import com.gravatar.services.Result
+import com.gravatar.services.GravatarResult
 import com.gravatar.types.Email
 import com.yalantis.ucrop.UCrop
 import com.yalantis.ucrop.UCropActivity
@@ -725,12 +725,14 @@ class SignupEpilogueFragment : LoginBaseFormFragment<SignupEpilogueListener?>(),
                 mAccountStore.accessToken?.let { accessToken ->
                     startProgress(false)
                     lifecycleScope.launch {
-                        val result = mAvatarService.upload(
-                            file, Email(mAccountStore.account.email),
-                            accessToken
+                        val result = mAvatarService.uploadCatching(
+                            file,
+                            accessToken,
+                            hash = Email(mAccountStore.account.email).hash(),
+                            selectAvatar = true
                         )
                         when (result) {
-                            is Result.Success -> {
+                            is GravatarResult.Success -> {
                                 endProgress()
                                 AnalyticsTracker.track(Stat.ME_GRAVATAR_UPLOADED)
                                 mPhotoUrl = WPAvatarUtils.rewriteAvatarUrl(
@@ -742,7 +744,7 @@ class SignupEpilogueFragment : LoginBaseFormFragment<SignupEpilogueListener?>(),
                                 mIsAvatarAdded = true
                             }
 
-                            is Result.Failure -> {
+                            is GravatarResult.Failure -> {
                                 endProgress()
                                 showErrorDialogWithCloseButton(getString(R.string.signup_epilogue_error_avatar))
                                 val properties: MutableMap<String, Any?> = HashMap()
@@ -834,16 +836,16 @@ class SignupEpilogueFragment : LoginBaseFormFragment<SignupEpilogueListener?>(),
                 val uri = MediaUtils.downloadExternalMedia(context, Uri.parse(mUrl))
                 val file = File(URI(uri.toString()))
                 lifecycleScope.launch {
-                    when (val result = mAvatarService.upload(file, Email(mEmail), mToken)) {
-                        is Result.Success -> {
+                    when (val result = mAvatarService.uploadCatching(file, mToken, Email(mEmail).hash(), true)) {
+                        is GravatarResult.Success -> {
                             AppLog.i(
                                 AppLog.T.NUX,
                                 "Google avatar download and Gravatar upload succeeded."
                             )
                             AnalyticsTracker.track(Stat.ME_GRAVATAR_UPLOADED)
                         }
 
-                        is Result.Failure -> {
+                        is GravatarResult.Failure -> {
                             AppLog.i(
                                 AppLog.T.NUX,
                                 "Google avatar download and Gravatar upload failed."

WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java

@@ -820,7 +820,7 @@ private void showCommentWhenNonNull(
             avatarUrl = WPAvatarUtils.rewriteAvatarUrl(comment.getAuthorProfileImageUrl(), avatarSz);
         } else if (comment.getAuthorEmail() != null) {
             avatarUrl = new AvatarUrl(new Email(comment.getAuthorEmail()),
-                    new AvatarQueryOptions(avatarSz, null, null, null)).url().toString();
+                    new AvatarQueryOptions.Builder().setPreferredSize(avatarSz).build()).url(null).toString();
         }
         mImageManager.loadIntoCircle(binding.imageAvatar, ImageType.AVATAR_WITH_BACKGROUND, avatarUrl);
 

WordPress/src/main/java/org/wordpress/android/ui/comments/unified/UnifiedCommentViewHolder.kt

@@ -85,7 +85,9 @@ class UnifiedCommentViewHolder(
         } else if (!TextUtils.isEmpty(comment.authorEmail)) {
             AvatarUrl(
                 Email(comment.authorEmail),
-                AvatarQueryOptions(preferredSize = resourceProvider.getDimensionPixelSize(R.dimen.avatar_sz_medium))
+                AvatarQueryOptions {
+                    preferredSize = resourceProvider.getDimensionPixelSize(R.dimen.avatar_sz_medium)
+                }
             ).url().toString()
         } else {
             ""

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

@@ -22,7 +22,7 @@ import androidx.lifecycle.lifecycleScope
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import com.gravatar.services.AvatarService
-import com.gravatar.services.Result
+import com.gravatar.services.GravatarResult
 import com.gravatar.types.Email
 import com.yalantis.ucrop.UCrop
 import com.yalantis.ucrop.UCrop.Options
@@ -684,15 +684,22 @@ class MeFragment : Fragment(R.layout.me_fragment), OnScrollToTopListener {
         }
         binding?.showGravatarProgressBar(true)
         lifecycleScope.launch {
-            val result =
-                avatarService.upload(file, Email(accountStore.account.email), accountStore.accessToken.orEmpty())
+            val result = avatarService.uploadCatching(
+                file = file,
+                oauthToken = accountStore.accessToken.orEmpty(),
+                hash = Email(accountStore.account.email).hash(),
+                selectAvatar = true,
+            )
             when (result) {
-                is Result.Failure -> {
-                    AnalyticsTracker.track(ME_GRAVATAR_UPLOAD_EXCEPTION, mapOf("error_type" to result.error.name))
+                is GravatarResult.Failure -> {
+                    AnalyticsTracker.track(
+                        ME_GRAVATAR_UPLOAD_EXCEPTION,
+                        mapOf("error_type" to result.error.javaClass.name)
+                    )
                     EventBus.getDefault().post(GravatarUploadFinished(filePath, false))
                 }
 
-                is Result.Success -> {
+                is GravatarResult.Success -> {
                     AnalyticsTracker.track(ME_GRAVATAR_UPLOADED)
                     EventBus.getDefault().post(GravatarUploadFinished(filePath, true))
                 }

WordPress/src/main/java/org/wordpress/android/util/WPAvatarUtils.java

@@ -46,7 +46,11 @@ public static String rewriteAvatarUrl(@NonNull final String imageUrl, int avatar
         } else {
             try {
                 return new AvatarUrl(new URL(imageUrl),
-                        new AvatarQueryOptions(avatarSz, defaultImage, null, null)).url().toString();
+                        new AvatarQueryOptions.Builder()
+                            .setPreferredSize(avatarSz)
+                            .setDefaultAvatarOption(defaultImage)
+                            .build()
+                        ).url(null).toString();
             } catch (MalformedURLException | IllegalArgumentException e) {
                 return "";
             }

gradle/libs.versions.toml

@@ -63,7 +63,7 @@ google-play-app-update = '2.1.0'
 google-play-review = '2.0.2'
 google-play-services-auth = '20.4.1'
 google-services = '4.4.2'
-gravatar = '1.0.0'
+gravatar = '2.0.0'
 greenrobot-eventbus = '3.3.1'
 gutenberg-kit = 'trunk-a58a46f3fbb892f311b562e3c122d7ef4ebbfe33'
 gutenberg-mobile = 'v1.121.0'

libs/login/build.gradle

@@ -40,7 +40,7 @@ ext {
     // libs
     wordpressLintVersion = '2.1.0'
     wordpressUtilsVersion = '3.5.0'
-    gravatarSdkVersion = '0.2.0'
+    gravatarSdkVersion = '2.0.0'
 
     // main
     androidxAppCompatVersion = '1.6.1'

libs/login/src/main/java/org/wordpress/android/login/util/AvatarHelper.kt

@@ -23,8 +23,15 @@ object AvatarHelper {
         listener: AvatarRequestListener
     ) {
         val avatarSize = fragment.resources.getDimensionPixelSize(R.dimen.avatar_sz_login)
-        val avatarUrl = email?.let { AvatarUrl(Email(email),
-                AvatarQueryOptions(preferredSize = avatarSize, defaultAvatarOption = Status404)).url().toString() }
+        val avatarUrl = email?.let {
+            AvatarUrl(
+                email = Email(email),
+                avatarQueryOptions = AvatarQueryOptions {
+                    preferredSize = avatarSize
+                    defaultAvatarOption = Status404
+                }
+            ).url().toString()
+        }
         loadAvatarFromUrl(fragment, avatarUrl, avatarView, listener)
     }