Fix for Amazon purchase dialog not showing up

feature/amazon/src/main/AndroidManifest.xml

@@ -3,13 +3,19 @@
         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"
+                android:exported="false"
+                android:theme="@android:style/Theme.Translucent.NoTitleBar" />
     </application>
 
 </manifest>

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

@@ -232,13 +232,19 @@ internal class AmazonBilling constructor(
         executeRequestOnUIThread { connectionError ->
             if (connectionError == null) {
                 purchaseHandler.purchase(
+                    activity,
                     appUserID,
                     storeProduct,
                     presentedOfferingIdentifier,
+                    onPurchaseCompleted = {
+                        purchaseHandler.onPurchaseCompleted(activity)
+                    },
                     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/DefaultPurchasingServiceProvider.kt

@@ -1,11 +1,15 @@
 package com.revenuecat.purchases.amazon
 
+import android.app.Activity
 import android.content.Context
+import android.content.Intent
+import android.os.ResultReceiver
 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
 
+const val PROXY_AMAZON_BILLING_ACTIVITY_REQUEST_CODE = 192342
 class DefaultPurchasingServiceProvider : PurchasingServiceProvider {
 
     override fun registerListener(
@@ -20,9 +24,18 @@ class DefaultPurchasingServiceProvider : PurchasingServiceProvider {
     }
 
     override fun purchase(
-        sku: String
-    ): RequestId {
-        return PurchasingService.purchase(sku)
+        activity: Activity,
+        sku: String,
+        resultReceiver: ResultReceiver
+    ) {
+        val intent = Intent(activity, ProxyAmazonBillingActivity::class.java)
+        intent.putExtra("result_receiver", resultReceiver)
+        intent.putExtra("sku", sku)
+        activity.startActivityForResult(intent, PROXY_AMAZON_BILLING_ACTIVITY_REQUEST_CODE)
+    }
+
+    override fun onPurchaseCompleted(activity: Activity) {
+        activity.finishActivity(PROXY_AMAZON_BILLING_ACTIVITY_REQUEST_CODE)
     }
 
     override fun getProductData(

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

@@ -0,0 +1,21 @@
+package com.revenuecat.purchases.amazon
+
+import android.app.Activity
+import android.os.Bundle
+import android.os.ResultReceiver
+import com.amazon.device.iap.PurchasingService
+
+class ProxyAmazonBillingActivity : Activity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val sku = intent.getStringExtra("sku")
+        val resultReceiver = intent.getParcelableExtra("result_receiver") as? ResultReceiver
+
+        val requestId = PurchasingService.purchase(sku)
+
+        val bundle = Bundle().apply {
+            putParcelable("request_id", requestId)
+        }
+        resultReceiver?.send(0, bundle)
+    }
+}

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

@@ -1,6 +1,8 @@
 package com.revenuecat.purchases.amazon
 
+import android.app.Activity
 import android.content.Context
+import android.os.ResultReceiver
 import com.amazon.device.iap.PurchasingListener
 import com.amazon.device.iap.model.FulfillmentResult
 import com.amazon.device.iap.model.RequestId
@@ -10,7 +12,8 @@ interface PurchasingServiceProvider {
     fun registerListener(context: Context, listener: PurchasingListener)
     fun getProductData(skus: Set<String>): RequestId
     fun getUserData(): RequestId
-    fun purchase(sku: String): RequestId
+    fun purchase(activity: Activity, sku: String, resultReceiver: ResultReceiver)
     fun getPurchaseUpdates(reset: Boolean): RequestId
     fun notifyFulfillment(receiptId: String, fulfillmentResult: FulfillmentResult)
+    fun onPurchaseCompleted(activity: Activity)
 }

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.os.Bundle
+import android.os.Handler
+import android.os.Looper
+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
@@ -24,30 +29,50 @@ class PurchaseHandler(
     private val presentedOfferingsByProductIdentifier = mutableMapOf<String, String?>()
     private val purchaseCallbacks =
         mutableMapOf<RequestId, Pair<(Receipt, UserData) -> Unit, (PurchasesError) -> Unit>>()
+    private val purchaseCompletedCallbacks = mutableMapOf<RequestId, () -> Unit>()
 
     override fun purchase(
+        activity: Activity,
         appUserID: String,
         storeProduct: StoreProduct,
         presentedOfferingIdentifier: String?,
+        onPurchaseCompleted: () -> Unit,
         onSuccess: (Receipt, UserData) -> Unit,
         onError: (PurchasesError) -> Unit
     ) {
         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
+        val resultReceiver = object : ResultReceiver(Handler(Looper.getMainLooper())) {
+            override fun onReceiveResult(resultCode: Int, resultData: Bundle?) {
+                synchronized(this@PurchaseHandler) {
+                    val requestId = resultData?.get("request_id") as? RequestId
+                    if (requestId != null) {
+                        purchaseCompletedCallbacks[requestId] = onPurchaseCompleted
+                        purchaseCallbacks[requestId] = onSuccess to onError
+                        productTypes[storeProduct.sku] = storeProduct.type
+                        presentedOfferingsByProductIdentifier[storeProduct.sku] = presentedOfferingIdentifier
+                    } else {
+                        errorLog("No RequestId coming from ProxyAmazonBillingActivity")
+                    }
+                }
+            }
         }
+        purchasingServiceProvider.purchase(activity, storeProduct.sku, resultReceiver)
+    }
+
+    override fun onPurchaseCompleted(activity: Activity) {
+        purchasingServiceProvider.onPurchaseCompleted(activity)
     }
 
     override fun onPurchaseResponse(response: PurchaseResponse) {
+        val requestId = response.requestId
+        val purchaseCompletedCallback = synchronized(this) { purchaseCompletedCallbacks.remove(requestId) }
+        purchaseCompletedCallback?.invoke()
+
         // Amazon is catching all exceptions and swallowing them so we have to catch ourselves and log
         try {
             log(LogIntent.DEBUG, AmazonStrings.PURCHASE_REQUEST_FINISHED.format(response.toJSON().toString(1)))
 
-            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,6 @@
 package com.revenuecat.purchases.amazon.listener
 
+import android.app.Activity
 import com.amazon.device.iap.PurchasingListener
 import com.amazon.device.iap.model.ProductDataResponse
 import com.amazon.device.iap.model.PurchaseUpdatesResponse
@@ -23,11 +24,16 @@ interface PurchaseResponseListener : PurchasingListener {
         /* intentionally ignored. Use PurchaseUpdatesResponseListener instead */
     }
 
+    @SuppressWarnings("LongParameterList")
     fun purchase(
+        activity: Activity,
         appUserID: String,
         storeProduct: StoreProduct,
         presentedOfferingIdentifier: String?,
+        onPurchaseCompleted: () -> Unit,
         onSuccess: (Receipt, UserData) -> Unit,
         onError: (PurchasesError) -> Unit
     )
+
+    fun onPurchaseCompleted(activity: Activity)
 }