Fix for Amazon purchase dialog not showing up

api-tester/build.gradle

@@ -17,5 +17,5 @@ android {
 dependencies {
     implementation project(path: ':public')
     implementation project(path: ':purchases')
-    implementation 'androidx.annotation:annotation:1.3.0'
+    implementation "androidx.annotation:annotation:$annotationVersion"
 }

build.gradle

@@ -11,6 +11,8 @@ buildscript {
     ext.robolectricVersion = "4.6.1"
     ext.mockkVersion = "1.10.0"
     ext.assertJVersion = "3.13.2"
+    ext.annotationVersion = "1.3.0"
+
     repositories {
         mavenCentral()
         google()

feature/amazon/build.gradle

@@ -13,16 +13,19 @@ dependencies {
     implementation project(":utils")
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+    implementation "androidx.annotation:annotation:$annotationVersion"
 
     latestDependenciesImplementation "com.amazon.device:amazon-appstore-sdk:$amazonVersion"
     unityIAPCompileOnly files("libs/in-app-purchasing-${amazon2Version}.jar")
 
     testImplementation "com.amazon.device:amazon-appstore-sdk:$amazonVersion"
     testImplementation project(":test-utils")
     testImplementation "androidx.test:core:$testLibrariesVersion"
+    testImplementation "androidx.test:core-ktx:$testLibrariesVersion"
     testImplementation "androidx.test:runner:$testLibrariesVersion"
     testImplementation "androidx.test:rules:$testLibrariesVersion"
     testImplementation "androidx.test.ext:junit:$testJUnitVersion"
+    testImplementation "androidx.test.ext:junit-ktx:$testJUnitVersion"
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation "io.mockk:mockk:$mockkVersion"
     testImplementation "org.assertj:assertj-core:$assertJVersion"

feature/amazon/src/main/AndroidManifest.xml

@@ -3,13 +3,17 @@
         package="com.revenuecat.purchases.amazon">
 
     <application>
-        <receiver android:name = "com.amazon.device.iap.ResponseReceiver"
-                android:permission = "com.amazon.inapp.purchasing.Permission.NOTIFY"
-                android:exported = "true">
+        <receiver
+                android:name="com.amazon.device.iap.ResponseReceiver"
+                android:exported="true"
+                android:permission="com.amazon.inapp.purchasing.Permission.NOTIFY">
             <intent-filter>
-                <action android:name = "com.amazon.inapp.purchasing.NOTIFY" />
+                <action android:name="com.amazon.inapp.purchasing.NOTIFY" />
             </intent-filter>
         </receiver>
+        <activity
+                android:name=".ProxyAmazonBillingActivity"
+                android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation" />
     </application>
 
 </manifest>

feature/amazon/src/main/java/com/revenuecat/purchases/amazon/AmazonBilling.kt

@@ -53,7 +53,8 @@ internal class AmazonBilling constructor(
     private val mainHandler: Handler,
     private val purchasingServiceProvider: PurchasingServiceProvider = DefaultPurchasingServiceProvider(),
     private val productDataHandler: ProductDataResponseListener = ProductDataHandler(purchasingServiceProvider),
-    private val purchaseHandler: PurchaseResponseListener = PurchaseHandler(purchasingServiceProvider),
+    private val purchaseHandler: PurchaseResponseListener =
+        PurchaseHandler(purchasingServiceProvider, applicationContext),
     private val purchaseUpdatesHandler: PurchaseUpdatesResponseListener = PurchaseUpdatesHandler(
         purchasingServiceProvider
     ),
@@ -232,13 +233,17 @@ internal class AmazonBilling constructor(
         executeRequestOnUIThread { connectionError ->
             if (connectionError == null) {
                 purchaseHandler.purchase(
+                    mainHandler,
+                    activity,
                     appUserID,
                     storeProduct,
                     presentedOfferingIdentifier,
                     onSuccess = { receipt, userData ->
                         handleReceipt(receipt, userData, storeProduct, presentedOfferingIdentifier)
                     },
-                    onError = ::onPurchaseError
+                    onError = {
+                        onPurchaseError(it)
+                    }
                 )
             } else {
                 onPurchaseError(connectionError)

feature/amazon/src/main/java/com/revenuecat/purchases/amazon/AmazonStrings.kt

@@ -13,6 +13,8 @@ object AmazonStrings {
     const val ERROR_PURCHASE_NOT_SUPPORTED = "Failed to make purchase. Call is not supported"
     const val ERROR_PURCHASE_ALREADY_OWNED = "Failed to make purchase. User already owns SKU."
     const val ERROR_PURCHASE_INVALID_SKU = "Failed to make purchase. SKU is invalid"
+    const val ERROR_PURCHASE_INVALID_PROXY_ACTIVITY_ARGUMENTS = "Failed to make purchase. Arguments are invalid. \n " +
+        "Intent: %s"
     const val ERROR_PURCHASE_FAILED = "Failed to make purchase. " +
         "This error normally means that the purchase was cancelled"
     const val ERROR_FETCHING_RECEIPT_INFO = "There was an error fetching receipt information: %s"

feature/amazon/src/main/java/com/revenuecat/purchases/amazon/DefaultPurchasingServiceProvider.kt

@@ -5,7 +5,9 @@ import com.amazon.device.iap.PurchasingListener
 import com.amazon.device.iap.PurchasingService
 import com.amazon.device.iap.model.FulfillmentResult
 import com.amazon.device.iap.model.RequestId
+import kotlinx.parcelize.Parcelize
 
+@Parcelize
 class DefaultPurchasingServiceProvider : PurchasingServiceProvider {
 
     override fun registerListener(
@@ -19,9 +21,7 @@ class DefaultPurchasingServiceProvider : PurchasingServiceProvider {
         return PurchasingService.getUserData()
     }
 
-    override fun purchase(
-        sku: String
-    ): RequestId {
+    override fun purchase(sku: String): RequestId {
         return PurchasingService.purchase(sku)
     }
 

feature/amazon/src/main/java/com/revenuecat/purchases/amazon/ProxyAmazonBillingActivity.kt

@@ -0,0 +1,51 @@
+package com.revenuecat.purchases.amazon
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.os.ResultReceiver
+import com.revenuecat.purchases.amazon.purchasing.ProxyAmazonBillingDelegate
+
+internal class ProxyAmazonBillingActivity : Activity() {
+
+    companion object {
+        const val EXTRAS_RESULT_RECEIVER = "result_receiver"
+        const val EXTRAS_SKU = "sku"
+        const val EXTRAS_SERVICE_PROVIDER = "service_provider"
+        const val EXTRAS_REQUEST_ID = "request_id"
+
+        fun newStartIntent(
+            context: Context,
+            resultReceiver: ResultReceiver,
+            sku: String,
+            purchasingServiceProvider: PurchasingServiceProvider
+        ): Intent {
+            val intent = Intent(context, ProxyAmazonBillingActivity::class.java)
+            intent.putExtra(EXTRAS_RESULT_RECEIVER, resultReceiver)
+            intent.putExtra(EXTRAS_SKU, sku)
+            intent.putExtra(EXTRAS_SERVICE_PROVIDER, purchasingServiceProvider)
+            return intent
+        }
+    }
+
+    private var proxyAmazonBillingDelegate: ProxyAmazonBillingDelegate? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        // Applying theme programmatically because when applying via AndroidManifest, theme is not being
+        // applied correctly.
+        // What happens is that applying @android:style/Theme.Translucent.NoTitleBar in the manifest works
+        // but applying a theme that has that theme as parent, the Activity is not translucent
+        setTheme(R.style.ProxyAmazonBillingActivityTheme)
+        super.onCreate(savedInstanceState)
+
+        proxyAmazonBillingDelegate = ProxyAmazonBillingDelegate()
+        proxyAmazonBillingDelegate?.onCreate(this, savedInstanceState)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        proxyAmazonBillingDelegate?.onDestroy(this)
+        proxyAmazonBillingDelegate = null
+    }
+}

feature/amazon/src/main/java/com/revenuecat/purchases/amazon/ProxyAmazonBillingActivityBroadcastReceiver.kt

@@ -0,0 +1,38 @@
+package com.revenuecat.purchases.amazon
+
+import android.app.Activity
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import androidx.annotation.VisibleForTesting
+import java.lang.ref.WeakReference
+
+internal class ProxyAmazonBillingActivityBroadcastReceiver(activity: Activity) : BroadcastReceiver() {
+
+    private val activity: WeakReference<Activity>
+
+    init {
+        this.activity = WeakReference(activity)
+    }
+
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    var onReceiveCalled = false
+
+    override fun onReceive(context: Context, intent: Intent) {
+        onReceiveCalled = true
+        activity.get()?.finish()
+    }
+
+    companion object {
+        const val PURCHASE_FINISHED_ACTION = "com.revenuecat.purchases.purchase_finished"
+
+        fun newPurchaseFinishedIntentFilter(): IntentFilter = IntentFilter(PURCHASE_FINISHED_ACTION)
+
+        fun newPurchaseFinishedIntent(applicationContext: Context): Intent {
+            return Intent(PURCHASE_FINISHED_ACTION).also { intent ->
+                intent.setPackage(applicationContext.packageName)
+            }
+        }
+    }
+}

feature/amazon/src/main/java/com/revenuecat/purchases/amazon/PurchasingServiceProvider.kt

@@ -1,11 +1,12 @@
 package com.revenuecat.purchases.amazon
 
 import android.content.Context
+import android.os.Parcelable
 import com.amazon.device.iap.PurchasingListener
 import com.amazon.device.iap.model.FulfillmentResult
 import com.amazon.device.iap.model.RequestId
 
-interface PurchasingServiceProvider {
+interface PurchasingServiceProvider : Parcelable {
 
     fun registerListener(context: Context, listener: PurchasingListener)
     fun getProductData(skus: Set<String>): RequestId

feature/amazon/src/main/java/com/revenuecat/purchases/amazon/handler/PurchaseHandler.kt

@@ -1,5 +1,10 @@
 package com.revenuecat.purchases.amazon.handler
 
+import android.app.Activity
+import android.content.Context
+import android.os.Bundle
+import android.os.Handler
+import android.os.ResultReceiver
 import com.amazon.device.iap.model.PurchaseResponse
 import com.amazon.device.iap.model.Receipt
 import com.amazon.device.iap.model.RequestId
@@ -8,6 +13,8 @@ import com.revenuecat.purchases.ProductType
 import com.revenuecat.purchases.PurchasesError
 import com.revenuecat.purchases.PurchasesErrorCode
 import com.revenuecat.purchases.amazon.AmazonStrings
+import com.revenuecat.purchases.amazon.ProxyAmazonBillingActivity
+import com.revenuecat.purchases.amazon.ProxyAmazonBillingActivityBroadcastReceiver
 import com.revenuecat.purchases.amazon.PurchasingServiceProvider
 import com.revenuecat.purchases.amazon.listener.PurchaseResponseListener
 import com.revenuecat.purchases.common.LogIntent
@@ -17,7 +24,8 @@ import com.revenuecat.purchases.models.StoreProduct
 import com.revenuecat.purchases.strings.PurchaseStrings
 
 class PurchaseHandler(
-    private val purchasingServiceProvider: PurchasingServiceProvider
+    private val purchasingServiceProvider: PurchasingServiceProvider,
+    private val applicationContext: Context
 ) : PurchaseResponseListener {
 
     private val productTypes = mutableMapOf<String, ProductType>()
@@ -26,6 +34,8 @@ class PurchaseHandler(
         mutableMapOf<RequestId, Pair<(Receipt, UserData) -> Unit, (PurchasesError) -> Unit>>()
 
     override fun purchase(
+        mainHandler: Handler,
+        activity: Activity,
         appUserID: String,
         storeProduct: StoreProduct,
         presentedOfferingIdentifier: String?,
@@ -34,11 +44,48 @@ class PurchaseHandler(
     ) {
         log(LogIntent.PURCHASE, PurchaseStrings.PURCHASING_PRODUCT.format(storeProduct.sku))
 
-        val requestId = purchasingServiceProvider.purchase(storeProduct.sku)
-        synchronized(this@PurchaseHandler) {
-            purchaseCallbacks[requestId] = onSuccess to onError
-            productTypes[storeProduct.sku] = storeProduct.type
-            presentedOfferingsByProductIdentifier[storeProduct.sku] = presentedOfferingIdentifier
+        startProxyActivity(mainHandler, activity, storeProduct, presentedOfferingIdentifier, onSuccess, onError)
+    }
+
+    @SuppressWarnings("LongParameterList")
+    private fun startProxyActivity(
+        mainHandler: Handler,
+        activity: Activity,
+        storeProduct: StoreProduct,
+        presentedOfferingIdentifier: String?,
+        onSuccess: (Receipt, UserData) -> Unit,
+        onError: (PurchasesError) -> Unit
+    ) {
+        val resultReceiver =
+            createRequestIdResultReceiver(mainHandler, storeProduct, presentedOfferingIdentifier, onSuccess, onError)
+        val intent = ProxyAmazonBillingActivity.newStartIntent(
+            activity,
+            resultReceiver,
+            storeProduct.sku,
+            purchasingServiceProvider
+        )
+        // ProxyAmazonBillingActivity will initiate the purchase
+        activity.startActivity(intent)
+    }
+
+    private fun createRequestIdResultReceiver(
+        mainHandler: Handler,
+        storeProduct: StoreProduct,
+        presentedOfferingIdentifier: String?,
+        onSuccess: (Receipt, UserData) -> Unit,
+        onError: (PurchasesError) -> Unit
+    ) = object : ResultReceiver(mainHandler) {
+        override fun onReceiveResult(resultCode: Int, resultData: Bundle?) {
+            synchronized(this@PurchaseHandler) {
+                val requestId = resultData?.get(ProxyAmazonBillingActivity.EXTRAS_REQUEST_ID) as? RequestId
+                if (requestId != null) {
+                    purchaseCallbacks[requestId] = onSuccess to onError
+                    productTypes[storeProduct.sku] = storeProduct.type
+                    presentedOfferingsByProductIdentifier[storeProduct.sku] = presentedOfferingIdentifier
+                } else {
+                    errorLog("No RequestId coming from ProxyAmazonBillingActivity")
+                }
+            }
         }
     }
 
@@ -47,7 +94,11 @@ class PurchaseHandler(
         try {
             log(LogIntent.DEBUG, AmazonStrings.PURCHASE_REQUEST_FINISHED.format(response.toJSON().toString(1)))
 
+            val intent = ProxyAmazonBillingActivityBroadcastReceiver.newPurchaseFinishedIntent(applicationContext)
+            applicationContext.sendBroadcast(intent)
+
             val requestId = response.requestId
+
             val callbacks = synchronized(this) { purchaseCallbacks.remove(requestId) }
 
             callbacks?.let { (onSuccess, onError) ->

feature/amazon/src/main/java/com/revenuecat/purchases/amazon/listener/PurchaseResponseListener.kt

@@ -1,5 +1,7 @@
 package com.revenuecat.purchases.amazon.listener
 
+import android.app.Activity
+import android.os.Handler
 import com.amazon.device.iap.PurchasingListener
 import com.amazon.device.iap.model.ProductDataResponse
 import com.amazon.device.iap.model.PurchaseUpdatesResponse
@@ -23,7 +25,10 @@ interface PurchaseResponseListener : PurchasingListener {
         /* intentionally ignored. Use PurchaseUpdatesResponseListener instead */
     }
 
+    @SuppressWarnings("LongParameterList")
     fun purchase(
+        mainHandler: Handler,
+        activity: Activity,
         appUserID: String,
         storeProduct: StoreProduct,
         presentedOfferingIdentifier: String?,