@@ -46,7 +46,10 @@ class PurchaseUtils(
4646 this .completeCallback = completeCallback
4747 }
4848
49- fun initializeCheckout (withPurchaseFlow : Boolean = false, lessVerbose : Boolean = false): ActivityCheckout {
49+ fun initializeCheckout (
50+ withPurchaseFlow : Boolean = false,
51+ lessVerbose : Boolean = false
52+ ): ActivityCheckout {
5053 this .lessVerbose = lessVerbose
5154 checkout = Checkout .forActivity(activityContext, secureUtils.getBilling())
5255 checkout.start()
@@ -124,37 +127,43 @@ class PurchaseUtils(
124127 )
125128 ).subscribeOn(Schedulers .io())
126129 .observeOn(AndroidSchedulers .mainThread())
127- .doOnError {
128- isLoading(false )
129- Timber .e(it)
130- Toast .makeText(
131- activityContext,
132- R .string.purchaseVerificationFailed,
133- Toast .LENGTH_LONG
134- ).show()
135- secureUtils.onPurchaseRevert()
136- }
137- .subscribe {
138- isLoading(false )
139- Timber .d(" Verification done: %s" , it.toString())
140- if (secureUtils.isPurchaseValid(purchase, it)) {
141- if (! secureUtils.hasPurchasedPro()) {
142- Toast .makeText(activityContext, R .string.purchaseSuccess, Toast .LENGTH_LONG )
143- .show()
130+ .subscribe(
131+ {
132+ isLoading(false )
133+ Timber .d(" Verification done: %s" , it.toString())
134+ if (secureUtils.isPurchaseValid(purchase, it)) {
135+ if (! secureUtils.hasPurchasedPro()) {
136+ Toast .makeText(
137+ activityContext,
138+ R .string.purchaseSuccess,
139+ Toast .LENGTH_LONG
140+ )
141+ .show()
142+ }
143+ secureUtils.onPurchaseComplete(purchase)
144+ completeCallback()
145+ } else {
146+ if (! lessVerbose) {
147+ Toast .makeText(
148+ activityContext,
149+ R .string.purchaseVerificationFailed,
150+ Toast .LENGTH_LONG
151+ ).show()
152+ }
153+ secureUtils.onPurchaseRevert()
144154 }
145- secureUtils.onPurchaseComplete(purchase)
146- completeCallback( )
147- } else {
155+ }, {
156+ isLoading( false )
157+ Timber .e(it)
148158 if (! lessVerbose) {
149159 Toast .makeText(
150160 activityContext,
151161 R .string.purchaseVerificationFailed,
152162 Toast .LENGTH_LONG
153163 ).show()
154164 }
155- secureUtils.onPurchaseRevert()
156165 }
157- }
166+ )
158167 )
159168 secureUtils.onPurchaseComplete(purchase)
160169 }
0 commit comments