Replace QE in browser for the native one

When the user taps over "Change Avatar" the Gravatar Native QE will be shown. If it needs authorization, the OAuth screen will be opened automatically. ^ Conflicts: ^ modules/services/utils/src/main/java/au/com/shiftyjelly/pocketcasts/utils/featureflag/Feature.kt
Automattic · Oct 31, 2024 · aeea00c · aeea00c
1 parent 6b59c30
commit aeea00c
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 2 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -290,6 +290,16 @@
                 <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">
+                <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"/>

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -236,6 +236,7 @@ subprojects {
                 buildConfigField("String", "ENCRYPTION_KEY", "\"${project.property("encryptionKey")}\"")
                 buildConfigField("String", "APP_SECRET", "\"${project.property("appSecret")}\"")
                 buildConfigField("String", "META_APP_ID", "\"${project.property("metaAppId")}\"")
+                buildConfigField("String", "GRAVATAR_APP_ID", "\"${project.property("gravatarAppId")}\"")
 
                 testInstrumentationRunner = project.property("testInstrumentationRunner") as String
                 testApplicationId = "au.com.shiftyjelly.pocketcasts.test${project.name.replace("-", "_")}"

diff --git a/dependencies.gradle.kts b/dependencies.gradle.kts
@@ -104,5 +104,6 @@ project.apply {
         set("encryptionKey", secretProperties.getProperty("encryption_key", ""))
         set("appSecret", secretProperties.getProperty("app_secret", ""))
         set("metaAppId", secretProperties.getProperty("metaAppId", ""))
+        set("gravatarAppId", secretProperties.getProperty("gravatarAppId", ""))
     }
 }
diff --git a/...es/profile/src/main/java/au/com/shiftyjelly/pocketcasts/profile/AccountDetailsFragment.kt b/...es/profile/src/main/java/au/com/shiftyjelly/pocketcasts/profile/AccountDetailsFragment.kt
@@ -28,6 +28,7 @@ import au.com.shiftyjelly.pocketcasts.compose.AppTheme
 import au.com.shiftyjelly.pocketcasts.models.to.SignInState
 import au.com.shiftyjelly.pocketcasts.models.to.SubscriptionStatus
 import au.com.shiftyjelly.pocketcasts.preferences.Settings
+import au.com.shiftyjelly.pocketcasts.profile.BuildConfig.GRAVATAR_APP_ID
 import au.com.shiftyjelly.pocketcasts.profile.champion.PocketCastsChampionBottomSheetDialog
 import au.com.shiftyjelly.pocketcasts.profile.databinding.FragmentAccountDetailsBinding
 import au.com.shiftyjelly.pocketcasts.repositories.playback.PlaybackManager
@@ -46,10 +47,18 @@ import au.com.shiftyjelly.pocketcasts.settings.onboarding.OnboardingUpgradeSourc
 import au.com.shiftyjelly.pocketcasts.ui.helper.FragmentHostListener
 import au.com.shiftyjelly.pocketcasts.utils.Gravatar
 import au.com.shiftyjelly.pocketcasts.utils.Util
+import au.com.shiftyjelly.pocketcasts.utils.featureflag.Feature
+import au.com.shiftyjelly.pocketcasts.utils.featureflag.FeatureFlag
 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.editor.AuthenticationMethod
+import com.gravatar.quickeditor.ui.editor.AvatarPickerContentLayout
+import com.gravatar.quickeditor.ui.editor.GravatarQuickEditorParams
+import com.gravatar.quickeditor.ui.oauth.OAuthParams
+import com.gravatar.types.Email
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import kotlinx.coroutines.launch
@@ -122,8 +131,34 @@ class AccountDetailsFragment : BaseFragment(), OnUserViewClickListener {
             if (signInState is SignInState.SignedIn) {
                 binding.btnChangeAvatar?.setOnClickListener {
                     analyticsTracker.track(AnalyticsEvent.ACCOUNT_DETAILS_CHANGE_AVATAR)
-                    Gravatar.refreshGravatarTimestamp()
-                    context?.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(Gravatar.getGravatarChangeAvatarUrl(signInState.email))))
+                    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
+                                },
+                            ),
+                            onAvatarSelected = {
+                                Gravatar.refreshGravatarTimestamp()
+                                binding.userView.signedInState = signInState
+                            },
+                            onDismiss = {},
+                        )
+                    } else {
+                        Gravatar.refreshGravatarTimestamp()
+                        context?.startActivity(
+                            Intent(
+                                Intent.ACTION_VIEW,
+                                Uri.parse(Gravatar.getGravatarChangeAvatarUrl(signInState.email)),
+                            ),
+                        )
+                    }
                 }
             }
 

diff --git a/modules/services/utils/src/main/java/au/com/shiftyjelly/pocketcasts/utils/Gravatar.kt b/modules/services/utils/src/main/java/au/com/shiftyjelly/pocketcasts/utils/Gravatar.kt
@@ -5,6 +5,8 @@ import java.net.URLEncoder
 
 object Gravatar {
 
+    const val GRAVATAR_QE_REDIRECT_URL = "https://pocketcasts.com/gravatar-qe-redirect"
+
     fun getGravatarChangeAvatarUrl(email: String): String =
         "https://gravatar.com/profile?is_quick_editor=true&email=${URLEncoder.encode(email, "UTF-8")}&scope=avatars&is_app_origin=true"
 

diff --git a/.../services/utils/src/main/java/au/com/shiftyjelly/pocketcasts/utils/featureflag/Feature.kt b/.../services/utils/src/main/java/au/com/shiftyjelly/pocketcasts/utils/featureflag/Feature.kt
@@ -171,6 +171,14 @@ enum class Feature(
         hasFirebaseRemoteFlag = false,
         hasDevToggle = true,
     ),
+    GRAVATAR_NATIVE_QUICK_EDITOR(
+        key = "gravatar_native_quick_editor",
+        title = "Gravatar native QE",
+        defaultValue = true,
+        tier = FeatureTier.Free,
+        hasFirebaseRemoteFlag = true,
+        hasDevToggle = true,
+    ),
     ;
 
     companion object {