in app messages support #1290

aboedo · 2023-09-25T19:47:01Z

This PR provides support for in app messages for declined payments with BillingClient. They can be shown using Purchases.showDeclinedPaymentMessageIfNeeded. It also provides an API in PurchasesConfiguration to display those messages automatically.

purchases/src/customEntitlementComputation/kotlin/com/revenuecat/purchases/Purchases.kt

aboedo · 2023-09-25T19:47:27Z

purchases/src/main/kotlin/com/revenuecat/purchases/PurchasesConfiguration.kt

+         * If this setting is disabled, you can show the toast by calling
+         * [Purchases.showDeclinedPaymentMessageIfNeeded]
+         */
+        fun showDeclinedPaymentMessagesAutomatically(showDeclinedPaymentMessagesAutomatically: Boolean) = apply {


not married to the naming

I've been thinking about it... From the documentation, this seems to be the only use case for inapp messages right now, but the naming in Google Play seems more generic, so I wonder if we should keep it generic as well and have it be showInAppMesssagesAutomatically... Will keep it like this for now since it's clearer what's going to be doing for now, but we might need to rename it in the future if Google adds more functionality.

aboedo · 2023-09-25T19:47:43Z

purchases/src/main/kotlin/com/revenuecat/purchases/google/BillingWrapper.kt

@@ -753,6 +756,25 @@ internal class BillingWrapper(

    override fun isConnected(): Boolean = billingClient?.isReady ?: false

+    override fun showInAppMessagesIfNeeded(activity: Activity) {


getting the activity might actually be tricky here

Was able to get it by using an ActivityLifecycleCallback in PurchasesOrchestrator

purchases/src/main/kotlin/com/revenuecat/purchases/google/BillingWrapper.kt

…lient inapp messages + other fixes

tonidero · 2023-09-26T07:25:56Z

purchases/src/main/kotlin/com/revenuecat/purchases/google/BillingWrapper.kt

@@ -753,6 +756,25 @@ internal class BillingWrapper(

    override fun isConnected(): Boolean = billingClient?.isReady ?: false

+    override fun showInAppMessagesIfNeeded(activity: Activity) {


Was able to get it by using an ActivityLifecycleCallback in PurchasesOrchestrator

tonidero · 2023-09-26T07:26:28Z

purchases/src/main/kotlin/com/revenuecat/purchases/utils/CustomActivityLifecycleHandler.kt

+import android.os.Bundle
+
+@Suppress("EmptyFunctionBlock")
+internal interface CustomActivityLifecycleHandler : ActivityLifecycleCallbacks {


This interface just adds default empty implementations to all callbacks so we can just use the ones we need in PurchasesOrchestrator

purchases/src/customEntitlementComputation/kotlin/com/revenuecat/purchases/Purchases.kt

tonidero · 2023-09-26T09:02:26Z

purchases/src/main/kotlin/com/revenuecat/purchases/google/BillingWrapper.kt

+        val inAppMessageParams = InAppMessageParams.newBuilder()
+            .addInAppMessageCategoryToShow(InAppMessageParams.InAppMessageCategoryId.TRANSACTIONAL)
+            .build()
+        val weakActivity = WeakReference(activity)


I'm using a weak reference here since I want to avoid any chance of leaking the activity if there is a problem connecting to the billing client.

purchases/src/main/kotlin/com/revenuecat/purchases/PurchasesConfiguration.kt

…test data

codecov · 2023-09-26T11:35:38Z

Codecov Report

Attention: 14 lines in your changes are missing coverage. Please review.

Comparison is base (be660b2) 85.94% compared to head (a8eb16f) 85.82%.

❗ Current head a8eb16f differs from pull request most recent head ed89ca6. Consider uploading reports for the commit ed89ca6 to get more accurate results

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1290      +/-   ##
==========================================
- Coverage   85.94%   85.82%   -0.12%     
==========================================
  Files         184      185       +1     
  Lines        6274     6314      +40     
  Branches      911      916       +5     
==========================================
+ Hits         5392     5419      +27     
- Misses        536      546      +10     
- Partials      346      349       +3

Files	Coverage Δ
...com/revenuecat/purchases/PurchasesConfiguration.kt	`89.39% <100.00%> (+1.06%)`	⬆️
...otlin/com/revenuecat/purchases/PurchasesFactory.kt	`85.79% <100.00%> (+0.08%)`	⬆️
.../com/revenuecat/purchases/PurchasesOrchestrator.kt	`83.47% <100.00%> (+0.32%)`	⬆️
...com/revenuecat/purchases/common/BillingAbstract.kt	`100.00% <ø> (ø)`
...com/revenuecat/purchases/strings/BillingStrings.kt	`0.00% <ø> (ø)`
...n/com/revenuecat/purchases/amazon/AmazonBilling.kt	`62.96% <0.00%> (-0.30%)`	⬇️
...otlin/com/revenuecat/purchases/common/AppConfig.kt	`81.96% <75.00%> (-0.49%)`	⬇️
.../com/revenuecat/purchases/google/BillingWrapper.kt	`83.60% <68.75%> (-0.52%)`	⬇️
.../purchases/utils/CustomActivityLifecycleHandler.kt	`0.00% <0.00%> (ø)`

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

purchases/src/main/kotlin/com/revenuecat/purchases/PurchasesConfiguration.kt

purchases/src/main/kotlin/com/revenuecat/purchases/strings/BillingStrings.kt

### Description Followup to #1290. This improves the API to future-proof them in case Google adds new in-app message types in the future. This is not a breaking change since the previous APIs haven't been released yet.

@MarkVillacampa

### Breaking Changes * Support for Billing Client 6 (#1209) via Mark Villacampa (@MarkVillacampa) * Bump minimum sdk version to Android 4.4 (API level 19) (#1265) via Mark Villacampa (@MarkVillacampa) * in app messages support (#1290) via Andy Boedo (@aboedo) ### Bugfixes * Add `awaitRestore` to customEntitlementComputation library (#1275) via Toni Rico (@tonidero) ### Other Changes * Future-proof in-app message APIs in case new types are added (#1293) via Toni Rico (@tonidero) * `Code style`: enabled `ALLOW_TRAILING_COMMA` (#1280) via NachoSoto (@NachoSoto)

draft for in app messages support

6d4fde5

aboedo requested review from tonidero and MarkVillacampa September 25, 2023 19:47

aboedo self-assigned this Sep 25, 2023

aboedo commented Sep 25, 2023

View reviewed changes

aboedo added the pr:feat A new feature label Sep 25, 2023

tonidero added 3 commits September 26, 2023 09:21

Use activity lifecycle callback to get activity and display billing c…

76509bf

…lient inapp messages + other fixes

Improve docs

a4eca20

Some fixes and tests

151334a

tonidero reviewed Sep 26, 2023

View reviewed changes

tonidero marked this pull request as ready for review September 26, 2023 09:03

tonidero requested a review from a team September 26, 2023 09:03

tonidero reviewed Sep 26, 2023

View reviewed changes

purchases/src/main/kotlin/com/revenuecat/purchases/PurchasesConfiguration.kt Outdated Show resolved Hide resolved

tonidero marked this pull request as draft September 26, 2023 10:44

Sync purchases if subscription status changed, to make sure we get la…

a8eb16f

…test data

tonidero marked this pull request as ready for review September 26, 2023 11:20

vegaro approved these changes Sep 26, 2023

View reviewed changes

purchases/src/main/kotlin/com/revenuecat/purchases/PurchasesConfiguration.kt Outdated Show resolved Hide resolved

purchases/src/main/kotlin/com/revenuecat/purchases/strings/BillingStrings.kt Outdated Show resolved Hide resolved

MarkVillacampa approved these changes Sep 26, 2023

View reviewed changes

tonidero added 2 commits September 26, 2023 16:41

Display snackbar on app open by default

31570b6

standardize strings

ed89ca6

tonidero enabled auto-merge (squash) September 26, 2023 14:44

tonidero disabled auto-merge September 26, 2023 14:49

tonidero merged commit e7bbdcd into main Sep 26, 2023

tonidero deleted the andy/sdk-3266-android-support-showing-inapp-messages branch September 26, 2023 15:03

tonidero added the pr:breaking Changes that are breaking label Sep 26, 2023

tonidero mentioned this pull request Sep 27, 2023

Future-proof in-app message APIs in case new types are added #1293

Merged

MarkVillacampa mentioned this pull request Sep 27, 2023

Release/7.0.0 #1296

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

in app messages support #1290

in app messages support #1290

aboedo commented Sep 25, 2023 •

edited by tonidero

Loading

aboedo Sep 25, 2023

tonidero Sep 26, 2023

aboedo Sep 25, 2023

tonidero Sep 26, 2023

tonidero Sep 26, 2023

tonidero Sep 26, 2023

tonidero Sep 26, 2023

codecov bot commented Sep 26, 2023 •

edited

Loading

		@@ -753,6 +756,25 @@ internal class BillingWrapper(

		override fun isConnected(): Boolean = billingClient?.isReady ?: false

		override fun showInAppMessagesIfNeeded(activity: Activity) {

in app messages support #1290

in app messages support #1290

Conversation

aboedo commented Sep 25, 2023 • edited by tonidero Loading

aboedo Sep 25, 2023

Choose a reason for hiding this comment

tonidero Sep 26, 2023

Choose a reason for hiding this comment

aboedo Sep 25, 2023

Choose a reason for hiding this comment

tonidero Sep 26, 2023

Choose a reason for hiding this comment

tonidero Sep 26, 2023

Choose a reason for hiding this comment

tonidero Sep 26, 2023

Choose a reason for hiding this comment

tonidero Sep 26, 2023

Choose a reason for hiding this comment

codecov bot commented Sep 26, 2023 • edited Loading

Codecov Report

aboedo commented Sep 25, 2023 •

edited by tonidero

Loading

codecov bot commented Sep 26, 2023 •

edited

Loading