@24i/smartapps-bigscreen-rnv-build-engine 0.17.27-alpha.2816 → 0.17.27-alpha.2818

package/dist/src/sdks/sdk-androidtv/sdkAndroidtv.js

@@ -216,6 +216,43 @@ const configureEntryUrl = (c) => {
     rnv_1.Common.addSystemInjects(c, injects);
     rnv_1.FileUtils.writeCleanFile(buildGradleFilePath, buildGradleFilePath, injects, null, c);
 };
+const configureIap = (c) => {
+    rnv_1.Logger.logTask('configureIap');
+    const projectDir = rnv_1.Common.getPlatformProjectDir(c);
+    const buildGradleFilePath = path.join(projectDir, 'app', buildGradleFileName);
+    const flavorFilePath = path.join(projectDir, `app/src/${flavourName}/java/com/twentyfouri/tvbridge/Flavor.kt`);
+    const enableIap = rnv_1.Common.getConfigProp(c, c.platform, 'enableIap', false);
+    let iapDependencies = [];
+    let flavorImports = [];
+    let flavorIapFactories = [];
+    if (enableIap) {
+        switch (c.platform) {
+            case 'firetv':
+                iapDependencies.push('implementation project(\':amazoniap\')');
+                flavorImports.push('import com.twentyfouri.bridgetv.amazoniap.AmazonIapServiceFactory');
+                flavorIapFactories.push('AmazonIapServiceFactory');
+                break;
+            case 'androidtv':
+                iapDependencies.push('implementation project(\':googleiap\')');
+                flavorImports.push('import com.twentyfouri.bridgetv.googleiap.GoogleIapServiceFactory');
+                flavorIapFactories.push('GoogleIapServiceFactory');
+                break;
+        }
+    }
+    const injects = [{
+            pattern: '{{IAP_DEPENDENCIES}}',
+            override: iapDependencies.join('\n'),
+        }, {
+            pattern: '{{FLAVOR_IMPORTS}}',
+            override: flavorImports.join('\n'),
+        }, {
+            pattern: '{{FLAVOR_IAP_FACTORIES}}',
+            override: flavorIapFactories.join(', '),
+        }];
+    rnv_1.Common.addSystemInjects(c, injects);
+    rnv_1.FileUtils.writeCleanFile(buildGradleFilePath, buildGradleFilePath, injects, null, c);
+    rnv_1.FileUtils.writeCleanFile(flavorFilePath, flavorFilePath, injects, null, c);
+};
 const configureAndroidProperties = async (c) => {
     rnv_1.Logger.logTask('configureAndroidProperties');
     let sdkDir = c.buildConfig?.sdks?.ANDROID_SDK || '';
@@ -240,6 +277,7 @@ const configureAndroidTVProject = async (c) => {
     await configureAndroidProperties(c);
     configureProject(c);
     configureEntryUrl(c);
+    configureIap(c);
     configureSigning(c);
     const gradlew = path.join(rnv_1.Common.getPlatformProjectDir(c), 'gradlew');
     fs.chmodSync(gradlew, '755');

package/dist/templates/platforms/androidtv/project/amazoniap/src/main/kotlin/com/twentyfouri/bridgetv/amazoniap/AmazonIapService.kt

@@ -14,6 +14,7 @@ import com.twentyfouri.tvbridge.common.IapException
 import com.twentyfouri.tvbridge.common.IapProduct
 import com.twentyfouri.tvbridge.common.IapPurchase
 import com.twentyfouri.tvbridge.common.IapService
+import org.json.JSONObject
 
 class AmazonIapService(private val context: Context) : IapService, PurchasingListener {
     private var callback: IapCallback? = null
@@ -38,7 +39,7 @@ class AmazonIapService(private val context: Context) : IapService, PurchasingLis
         if (result.requestStatus == PurchaseUpdatesResponse.RequestStatus.SUCCESSFUL) {
             callback?.checkNewPurchasesFinished(
                 result.receipts.map { receipt ->
-                    IapPurchase(receipt.sku, result.userData.userId, receipt.receiptId)
+                    IapPurchase(receipt.sku, result.userData.userId, receipt.toJSON())
                 }
             )
         } else {
@@ -53,7 +54,7 @@ class AmazonIapService(private val context: Context) : IapService, PurchasingLis
     override fun onPurchaseResponse(result: PurchaseResponse) {
         if (result.requestStatus == PurchaseResponse.RequestStatus.SUCCESSFUL) {
             callback?.purchaseFinished(
-                IapPurchase(result.receipt.sku, result.userData.userId, result.receipt.receiptId)
+                IapPurchase(result.receipt.sku, result.userData.userId, result.receipt.toJSON())
             )
         } else {
             callback?.purchaseFinished(IapException(result.requestStatus.name))
@@ -84,7 +85,8 @@ class AmazonIapService(private val context: Context) : IapService, PurchasingLis
         }
     }
 
-    override fun acknowledgeReceipt(receipt: String) {
-        PurchasingService.notifyFulfillment(receipt, FulfillmentResult.FULFILLED)
+    override fun acknowledgeReceipt(receipt: JSONObject) {
+        val receiptId = receipt.getString("receiptId")
+        PurchasingService.notifyFulfillment(receiptId, FulfillmentResult.FULFILLED)
     }
 }

package/dist/templates/platforms/androidtv/project/app/build.gradle

@@ -94,6 +94,7 @@ dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
 
     implementation project(':common')
+    {{IAP_DEPENDENCIES}}
 
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"

package/dist/templates/platforms/androidtv/project/app/src/bigscreenAppstage/java/com/twentyfouri/tvbridge/Flavor.kt

@@ -1,5 +1,10 @@
 package com.twentyfouri.tvbridge
 
-class Flavor: FlavorBase() {
+import com.twentyfouri.tvbridge.common.IapServiceFactory
+{{FLAVOR_IMPORTS}}
 
+class Flavor: FlavorBase() {
+    override fun getIapServiceFactories(): List<IapServiceFactory> {
+        return listOf({{FLAVOR_IAP_FACTORIES}})
+    }
 }

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/bridge/BridgeFromJavaScript.kt

@@ -14,6 +14,7 @@ import com.twentyfouri.tvbridge.webview.parser.TrackJsonModelParser.audioFromJso
 import com.twentyfouri.tvbridge.webview.parser.TrackJsonModelParser.textFromJson
 import com.twentyfouri.tvbridge.webview.parser.TrackJsonModelParser.toJson
 import com.twentyfouri.tvbridge.webview.viewmodel.WebViewModel
+import org.json.JSONObject
 import java.text.SimpleDateFormat
 import java.util.Arrays
 import java.util.concurrent.CountDownLatch
@@ -359,9 +360,17 @@ class BridgeFromJavaScript(
     }
 
     @JavascriptInterface
-    fun bridgeReceiptIAPValidated(receiptId: String?) {
-        Log.d(LOG_TAG, "bridgeReceiptIAPValidated receiptId=$receiptId")
-        viewModel.acknowledgeIapReceipt(receiptId ?: "")
+    fun bridgeReceiptIAPValidated(receipt: String?) {
+        Log.d(LOG_TAG, "bridgeReceiptIAPValidated receipt=$receipt")
+        val json = when {
+            receipt == null -> JSONObject()
+            receipt.startsWith('{') -> JSONObject(receipt)
+            else -> JSONObject().also {
+                it.put("receiptId", receipt)    // Amazon
+                it.put("purchaseToken", receipt)    // Google
+            }
+        }
+        viewModel.acknowledgeIapReceipt(json)
     }
 
     /***

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/bridge/BridgeToJavaScript.kt

@@ -11,6 +11,7 @@ import com.twentyfouri.tvbridge.bridge.BridgeFromJavaScript.Companion.LOG_TAG
 import com.twentyfouri.tvbridge.configuration.BridgeConfig
 import com.twentyfouri.tvbridge.webview.parser.TrackJsonModelParser.toJson
 import org.json.JSONArray
+import org.json.JSONObject
 
 class BridgeToJavaScript(
     config: BridgeConfig,
@@ -98,14 +99,14 @@ class BridgeToJavaScript(
 
     fun bridgeAndroidToJavaScript_IAPValidationSuccess(
         userId: String,
-        receiptId: String,
+        receipt: JSONObject,
         sku: String
     ) {
         Log.d(
             LOG_TAG,
-            "bridgeAndroidToJavaScript_IAPValidationSuccess sku=$sku receiptId=$receiptId"
+            "bridgeAndroidToJavaScript_IAPValidationSuccess sku=$sku receipt=$receipt"
         )
-        executeJavaScript("javascript:((function dispatchEvent(){var evt = document.createEvent('Events');evt.initEvent('${iapEventPrefix}iapSuccess',true,true);evt.userId='$userId';evt.receiptId='$receiptId';evt.sku='$sku';document.dispatchEvent(evt);})())")
+        executeJavaScript("javascript:((function dispatchEvent(){var evt = document.createEvent('Events');evt.initEvent('${iapEventPrefix}iapSuccess',true,true);evt.userId='$userId';evt.receipt='$receipt';evt.sku='$sku';document.dispatchEvent(evt);})())")
     }
 
     fun bridgeIAPGetProductDataSuccess(okSkus: String, badSkus: String) {

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/webview/viewmodel/WebViewModel.kt

@@ -14,7 +14,6 @@ import android.webkit.CookieManager
 import android.webkit.WebChromeClient
 import android.webkit.WebView
 import com.google.android.gms.ads.identifier.AdvertisingIdClient
-import com.google.android.gms.common.GooglePlayServicesNotAvailableException
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import com.twentyfouri.player.base.*
@@ -492,9 +491,9 @@ class WebViewModel @Inject constructor(
         iapService.getProducts(skus)
     }
 
-    fun acknowledgeIapReceipt(receiptId: String) {
+    fun acknowledgeIapReceipt(receipt: JSONObject) {
         iapService.setCallback(iapCallback)
-        iapService.acknowledgeReceipt(receiptId)
+        iapService.acknowledgeReceipt(receipt)
     }
 
     private fun dispatchKeyEvent(event: KeyEvent): Boolean {

package/dist/templates/platforms/androidtv/project/common/src/main/java/com/twentyfouri/tvbridge/common/IapService.kt

@@ -2,6 +2,7 @@ package com.twentyfouri.tvbridge.common
 
 import android.app.Activity
 import android.content.Context
+import org.json.JSONObject
 
 interface IapServiceFactory {
     fun detectSupport(context: Context): Boolean
@@ -23,7 +24,7 @@ interface IapService {
     fun checkNewPurchases()
     fun getProducts(skus: List<String>)
     fun purchase(activity: Activity, sku: String)
-    fun acknowledgeReceipt(receipt: String)
+    fun acknowledgeReceipt(receipt: JSONObject)
     fun setCallback(callback: IapCallback?)
 }
 
@@ -55,7 +56,7 @@ open class IapProduct(
 open class IapPurchase(
         val sku: String,
         val userId: String,
-        val receipt: String
+        val receipt: JSONObject
 )
 
 open class IapException(
@@ -104,7 +105,7 @@ open class NullIapService : IapService {
         callback?.purchaseFinished(UnsupportedOperationException())
     }
 
-    override fun acknowledgeReceipt(receipt: String) {
+    override fun acknowledgeReceipt(receipt: JSONObject) {
         callback?.acknowledgeReceiptFinished(UnsupportedOperationException())
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@24i/smartapps-bigscreen-rnv-build-engine",
-	"version": "0.17.27-alpha.2816",
+	"version": "0.17.27-alpha.2818",
 	"description": "Package with build engine for SmartApps BIGscreen projects...",
 	"main": "dist/src/index.js",
 	"scripts": {