Merge pull request #53 from dietmap/handle-verification-failure

Handle order verification failure
dietmap · Sep 14, 2020 · 28a2fd7 · 28a2fd7
2 parents 92613a7 + dd147cb
commit 28a2fd7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -84,8 +84,8 @@ jib {
 		labels = mapOf(
 				"maintainer" to "Krzysztof Koziol"
 		)
-		jvmFlags = listOf("-Xms512m", "-Djava.awt.headless=true")
+		jvmFlags = listOf("-Djava.awt.headless=true")
 		mainClass = "com.dietmap.yaak.YaakApplicationKt"
-		ports = listOf("8080", "9090")
+		ports = listOf("8080", "8778", "9090")
 	}
 }
diff --git a/src/main/kotlin/com/dietmap/yaak/domain/googleplay/GooglePlaySubscriptionService.kt b/src/main/kotlin/com/dietmap/yaak/domain/googleplay/GooglePlaySubscriptionService.kt
@@ -87,11 +87,18 @@ class GooglePlaySubscriptionService(val androidPublisherApiClient: AndroidPublis
 
     fun verifyOrders(orders: Collection<PurchaseRequest>): Boolean {
         orders
-                .map(::handlePurchase)
+                .map(::tryToVerifyOrder)
                 .also { logger.info { "Verified ${it.size} user orders" } }
         return userAppClient.checkSubscription()?.status == USER_APP_STATUS_ACTIVE
     }
 
+    private fun tryToVerifyOrder(purchaseRequest: PurchaseRequest) = try {
+        logger.debug { "About to verify user order: $purchaseRequest" }
+        handlePurchase(purchaseRequest)
+    } catch (e: Exception) {
+        logger.error(e) { "Error during verification of user order" }
+    }
+
     private fun handleStatusUpdate(packageName: String, notification: GooglePlaySubscriptionNotification) {
         val subscription = androidPublisherApiClient.Purchases().Subscriptions().get(packageName, notification.subscriptionId, notification.purchaseToken).execute()
         logger.debug { "Google Play subscription details: $subscription" }