From 7bf93ea74b00ab7e8ceedac2aac6ad08fdf099ab Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sun, 16 Jul 2017 20:23:42 -0700 Subject: Test against proguard and fix minor details (#67) * Reenable enum in proguard rules * Add missing permission and upload to beta * Use kau permission const --- .../kotlin/com/pitchedapps/frost/utils/iab/IAB.kt | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IAB.kt') diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IAB.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IAB.kt index 964e771c..669b2c9e 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IAB.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IAB.kt @@ -158,13 +158,18 @@ private fun SettingsActivity.finishRestore(snackbar: Snackbar, hasPro: Boolean) */ fun Activity.validatePro() { L.d("Play Store Validate pro") - getInventory(Prefs.pro, false, { if (Prefs.pro) playStoreNoLongerPro() }) { - inv, helper -> - val proSku = inv.hasPurchase(FROST_PRO) - L.d("Play Store Validation finished: ${Prefs.pro} should be $proSku") - if (!proSku && Prefs.pro) playStoreNoLongerPro() - else if (proSku && !Prefs.pro) playStoreFoundPro() - helper.disposeWhenFinished() + try { + getInventory(Prefs.pro, false, { if (Prefs.pro) playStoreNoLongerPro() }) { + inv, helper -> + val proSku = inv.hasPurchase(FROST_PRO) + L.d("Play Store Validation finished: ${Prefs.pro} should be $proSku") + if (!proSku && Prefs.pro) playStoreNoLongerPro() + else if (proSku && !Prefs.pro) playStoreFoundPro() + IAB.dispose(helper) + } + } catch (e: Exception) { + L.e(e, "Play store validation exception") + IAB.dispose() } } -- cgit v1.2.3