Mastodon/Twidere-App-Android-Twitter-Mastodon
1
0
Fork 0
mirror of https://github.com/TwidereProject/Twidere-Android synced 2025-02-07 23:38:40 +01:00
Code Issues Releases Wiki Activity

made purchase flow working

Browse Source
This commit is contained in:
Mariotaku Lee 2017-01-01 21:14:01 +08:00
parent e46c024b02
commit 3ad0c2e631
3 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
twidere/src/google/kotlin/org/mariotaku/twidere/activity/GooglePlayInAppPurchaseActivity.kt
View File

@ -1,9 +1,11 @@
package org.mariotaku.twidere.activity
import android.app.Activity
import android.content.Intent
import android.os.Bundle
import android.support.v4.app.DialogFragment
import com.anjlab.android.iab.v3.BillingProcessor
import com.anjlab.android.iab.v3.Constants.*
import com.anjlab.android.iab.v3.TransactionDetails
import nl.komponents.kovenant.task
import nl.komponents.kovenant.ui.alwaysUi
@ -28,7 +30,7 @@ class GooglePlayInAppPurchaseActivity : BaseActivity(), BillingProcessor.IBillin
super.onCreate(savedInstanceState)
billingProcessor = BillingProcessor(this, Constants.GOOGLE_PLAY_LICENCING_PUBKEY, this)
if (!isFinishing && !BillingProcessor.isIabServiceAvailable(this)) {
handleError()
handleError(BILLING_RESPONSE_RESULT_USER_CANCELED)
}
}
@ -46,7 +48,7 @@ class GooglePlayInAppPurchaseActivity : BaseActivity(), BillingProcessor.IBillin
// MARK: Payment methods
override fun onBillingError(code: Int, error: Throwable?) {
handleError()
handleError(code)
}
override fun onBillingInitialized() {
@ -65,8 +67,8 @@ class GooglePlayInAppPurchaseActivity : BaseActivity(), BillingProcessor.IBillin
getProductDetailsAndFinish()
}
private fun handleError() {
setResult(RESULT_CANCELED)
private fun handleError(billingResponse: Int) {
setResult(getResultCode(billingResponse))
finish()
}
@ -79,14 +81,18 @@ class GooglePlayInAppPurchaseActivity : BaseActivity(), BillingProcessor.IBillin
val weakThis = WeakReference(this)
val dfRef = WeakReference(ProgressDialogFragment.show(supportFragmentManager, "consume_purchase_progress"))
task {
val bp = weakThis.get()?.billingProcessor ?: throw IllegalStateException()
val bp = weakThis.get()?.billingProcessor ?: throw PurchaseException(BILLING_RESPONSE_RESULT_USER_CANCELED)
bp.loadOwnedPurchasesFromGoogle()
val details = bp.getPurchaseTransactionDetails(productId)
return@task details ?: throw IllegalStateException()
return@task details ?: throw PurchaseException(BILLING_RESPONSE_RESULT_ITEM_NOT_OWNED)
}.successUi { details ->
weakThis.get()?.handlePurchased(details)
}.failUi { error ->
weakThis.get()?.handleError()
if (error is PurchaseException) {
weakThis.get()?.handleError(error.code)
} else {
weakThis.get()?.handleError(BILLING_RESPONSE_RESULT_ERROR)
}
}.alwaysUi {
weakThis.get()?.executeAfterFragmentResumed {
val fm = weakThis.get()?.supportFragmentManager
@ -100,14 +106,18 @@ class GooglePlayInAppPurchaseActivity : BaseActivity(), BillingProcessor.IBillin
val weakThis = WeakReference(this)
val dfRef = WeakReference(ProgressDialogFragment.show(supportFragmentManager, "consume_purchase_progress"))
task {
val bp = weakThis.get()?.billingProcessor ?: throw IllegalStateException()
val bp = weakThis.get()?.billingProcessor ?: throw PurchaseException(BILLING_RESPONSE_RESULT_USER_CANCELED)
bp.loadOwnedPurchasesFromGoogle()
val result = bp.getPurchaseTransactionDetails(productId)
return@task result ?: throw IllegalStateException()
return@task result ?: throw PurchaseException(BILLING_RESPONSE_RESULT_ITEM_NOT_OWNED)
}.successUi { details ->
weakThis.get()?.handlePurchased(details)
}.failUi { error ->
weakThis.get()?.handleError()
if (error is PurchaseException) {
weakThis.get()?.handleError(error.code)
} else {
weakThis.get()?.handleError(BILLING_RESPONSE_RESULT_ERROR)
}
}.alwaysUi {
weakThis.get()?.executeAfterFragmentResumed {
val fm = weakThis.get()?.supportFragmentManager
@ -117,6 +127,17 @@ class GooglePlayInAppPurchaseActivity : BaseActivity(), BillingProcessor.IBillin
}
}
private fun getResultCode(billingResponse: Int): Int {
val resultCode = when (billingResponse) {
BILLING_RESPONSE_RESULT_OK -> Activity.RESULT_OK
BILLING_RESPONSE_RESULT_USER_CANCELED -> Activity.RESULT_CANCELED
else -> billingResponse
}
return resultCode
}
class PurchaseException(val code: Int) : Exception()
companion object {
const val EXTRA_PRODUCT_ID = "product_id"
const val ACTION_RESTORE_PURCHASE = "${INTENT_PACKAGE_PREFIX}RESTORE_PURCHASE"

12
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/premium/ExtraFeaturesIntroductionCardFragment.kt
View File

@ -1,10 +1,13 @@
package org.mariotaku.twidere.fragment.premium
import android.app.Activity
import android.content.Intent
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.Toast
import com.anjlab.android.iab.v3.Constants.BILLING_RESPONSE_RESULT_ITEM_NOT_OWNED
import kotlinx.android.synthetic.main.fragment_extra_features_introduction.*
import kotlinx.android.synthetic.main.layout_extra_features_introduction.*
import org.mariotaku.twidere.R
@ -45,9 +48,16 @@ class ExtraFeaturesIntroductionCardFragment : BaseSupportFragment() {
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
when (requestCode) {
REQUEST_PURCHASE, REQUEST_RESTORE_PURCHASE -> {
REQUEST_PURCHASE -> {
activity?.recreate()
}
REQUEST_RESTORE_PURCHASE -> {
if (requestCode == Activity.RESULT_OK) {
activity?.recreate()
} else if (resultCode == BILLING_RESPONSE_RESULT_ITEM_NOT_OWNED) {
Toast.makeText(context, R.string.message_extra_features_not_purchased, Toast.LENGTH_SHORT).show()
}
}
}
}

2
twidere/src/main/res/values/strings.xml
View File

@ -872,4 +872,6 @@
<string name="preference_title_filter_subscriptions">Filter subscriptions</string>
<string name="preference_title_filter_manage_subscriptions">Manage</string>
<string name="title_manage_filter_subscriptions">Filter subscriptions</string>
<!-- Toast message for enhanced (paid) features not purchased while trying to restore purchase -->
<string name="message_extra_features_not_purchased">Enhanced features not purchased</string>
</resources>