From ba5c2ad22a83ade0e8a451d8fc9cdbdb07cd2679 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?He=CC=81ctor=20Abraham?=
 <hector.abraham.morillo.prieto@automattic.com>
Date: Wed, 13 Nov 2024 15:13:31 +0100
Subject: [PATCH] Use GravatarQuickEditorActivity instead of the BottomSheet

As it is not viable to modify the activity to use `singleTask`, we need to implement the recently added GravatarQuickEditorActivity to handle the OAuth authorization.
---
 app/src/main/AndroidManifest.xml              | 18 +++++---
 gradle/libs.versions.toml                     |  2 +-
 .../profile/AccountDetailsFragment.kt         | 43 ++++++++++++-------
 3 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 016400e532e..07a7031a477 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -290,19 +290,25 @@
                 <data android:pathPrefix="/get/"/>
             </intent-filter>
 
-            <!-- https://lists.pocketcasts.com/.well-known/assetlinks.json is needed for this to work -->
-            <intent-filter android:autoVerify="true">
+            <meta-data
+                    android:name="android.app.shortcuts"
+                    android:resource="@xml/shortcuts"/>
+        </activity>
+
+        <activity
+            android:name="com.gravatar.quickeditor.ui.GravatarQuickEditorActivity"
+            tools:node="merge">
+
+            <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data android:scheme="https"/>
                 <data android:host="pocketcasts.com"/>
                 <data android:pathPrefix="/gravatar-qe-redirect"/>
             </intent-filter>
-
-            <meta-data
-                    android:name="android.app.shortcuts"
-                    android:resource="@xml/shortcuts"/>
         </activity>
 
         <activity-alias
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7add1eda4e2..5cfd4954c27 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,7 +26,7 @@ espresso = "3.6.1"
 firebase = "33.3.0"
 fragment = "1.8.4"
 glance = "1.0.0"
-gravatar = "2.0.0"
+gravatar = "425-2090953c8b2f8b2917a74d5bd2c91c8d3b75f125"
 google-services = "4.4.2"
 hilt = "2.52"
 hilt-compiler = "1.2.0"
diff --git a/modules/features/profile/src/main/java/au/com/shiftyjelly/pocketcasts/profile/AccountDetailsFragment.kt b/modules/features/profile/src/main/java/au/com/shiftyjelly/pocketcasts/profile/AccountDetailsFragment.kt
index 4d47f6f5f45..894919d1dde 100644
--- a/modules/features/profile/src/main/java/au/com/shiftyjelly/pocketcasts/profile/AccountDetailsFragment.kt
+++ b/modules/features/profile/src/main/java/au/com/shiftyjelly/pocketcasts/profile/AccountDetailsFragment.kt
@@ -53,7 +53,9 @@ import au.com.shiftyjelly.pocketcasts.utils.log.LogBuffer
 import au.com.shiftyjelly.pocketcasts.views.dialog.ConfirmationDialog
 import au.com.shiftyjelly.pocketcasts.views.fragments.BaseFragment
 import au.com.shiftyjelly.pocketcasts.views.helper.NavigationIcon
-import com.gravatar.quickeditor.GravatarQuickEditor
+import com.gravatar.quickeditor.ui.GetQuickEditorResult
+import com.gravatar.quickeditor.ui.GravatarQuickEditorActivity
+import com.gravatar.quickeditor.ui.GravatarQuickEditorResult
 import com.gravatar.quickeditor.ui.editor.AuthenticationMethod
 import com.gravatar.quickeditor.ui.editor.AvatarPickerContentLayout
 import com.gravatar.quickeditor.ui.editor.GravatarQuickEditorParams
@@ -103,6 +105,19 @@ class AccountDetailsFragment : BaseFragment(), OnUserViewClickListener {
     private val viewModel: AccountDetailsViewModel by viewModels()
     private var binding: FragmentAccountDetailsBinding? = null
 
+    private val getQEResult = registerForActivityResult(GetQuickEditorResult()) { quickEditorResult ->
+        when (quickEditorResult) {
+            GravatarQuickEditorResult.AVATAR_SELECTED -> {
+                Gravatar.refreshGravatarTimestamp()
+                viewModel.signInState.observe(viewLifecycleOwner) { signInState ->
+                    binding?.userView?.signedInState = signInState
+                }
+            }
+
+            else -> { /* Do nothing */ }
+        }
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         binding = FragmentAccountDetailsBinding.inflate(inflater, container, false)
         return binding?.root
@@ -132,23 +147,19 @@ class AccountDetailsFragment : BaseFragment(), OnUserViewClickListener {
                 binding.btnChangeAvatar?.setOnClickListener {
                     analyticsTracker.track(AnalyticsEvent.ACCOUNT_DETAILS_CHANGE_AVATAR)
                     if (FeatureFlag.isEnabled(Feature.GRAVATAR_NATIVE_QUICK_EDITOR)) {
-                        GravatarQuickEditor.show(
-                            activity = requireActivity(),
-                            gravatarQuickEditorParams = GravatarQuickEditorParams {
-                                email = Email(signInState.email)
-                                avatarPickerContentLayout = AvatarPickerContentLayout.Horizontal
-                            },
-                            authenticationMethod = AuthenticationMethod.OAuth(
-                                OAuthParams {
-                                    clientId = GRAVATAR_APP_ID
-                                    redirectUri = Gravatar.GRAVATAR_QE_REDIRECT_URL
+                        getQEResult.launch(
+                            GravatarQuickEditorActivity.GravatarEditorActivityArguments(
+                                gravatarQuickEditorParams = GravatarQuickEditorParams {
+                                    email = Email(signInState.email)
+                                    avatarPickerContentLayout = AvatarPickerContentLayout.Horizontal
                                 },
+                                authenticationMethod = AuthenticationMethod.OAuth(
+                                    OAuthParams {
+                                        clientId = GRAVATAR_APP_ID
+                                        redirectUri = Gravatar.GRAVATAR_QE_REDIRECT_URL
+                                    },
+                                ),
                             ),
-                            onAvatarSelected = {
-                                Gravatar.refreshGravatarTimestamp()
-                                binding.userView.signedInState = signInState
-                            },
-                            onDismiss = {},
                         )
                     } else {
                         Gravatar.refreshGravatarTimestamp()