sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 19:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make app cancel sub if user cancelled in play store

Browse source
This commit is contained in:
Phillip Thelen 2020-01-30 17:21:59 +01:00
parent d604f7812d
commit a488fab400
6 changed files with 55 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/build.gradle
View file

@ -153,7 +153,7 @@ android {
multiDexEnabled true
resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW"
versionCode 2360
versionCode 2362
versionName "2.5"
}

3
Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
View file

@ -250,6 +250,9 @@ interface ApiService {
@POST("/iap/android/subscribe")
fun validateSubscription(@Body request: SubscriptionValidationRequest): Flowable<HabitResponse<Void>>
@GET("/iap/android/subscribe/cancel")
fun cancelSubscription(): Flowable<HabitResponse<Void>>
@POST("/iap/android/norenew-subscribe")
fun validateNoRenewSubscription(@Body request: PurchaseValidationRequest): Flowable<HabitResponse<Void>>

1
Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
View file

@ -63,6 +63,7 @@ interface ApiClient {
fun purchaseQuest(key: String): Flowable<Any>
fun validateSubscription(request: SubscriptionValidationRequest): Flowable<Any>
fun validateNoRenewSubscription(request: PurchaseValidationRequest): Flowable<Any>
fun cancelSubscription(): Flowable<Any>
fun sellItem(itemType: String, itemKey: String): Flowable<User>

4
Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
View file

@ -347,6 +347,10 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
}
}
override fun cancelSubscription(): Flowable<Any> {
return apiService.cancelSubscription().compose(configureApiCallObserver())
}
override fun purchaseHourglassItem(type: String, itemKey: String): Flowable<Any> {
return apiService.purchaseHourglassItem(type, itemKey).compose(configureApiCallObserver())
}

21
Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt
View file

@ -115,6 +115,27 @@ class PurchaseHandler(activity: Activity, val crashlyticsProxy: CrashlyticsProxy
}
}
fun checkForSubscription(onSubscriptionFound: ((Purchase) -> Unit)) {
billingRequests?.getPurchases(ProductTypes.SUBSCRIPTION, null, object : RequestListener<Purchases> {
override fun onSuccess(result: Purchases) {
var lastPurchase: Purchase? = null
for (purchase in result.list) {
if (lastPurchase != null && lastPurchase.time > purchase.time) {
continue
} else {
lastPurchase = purchase
}
}
if (lastPurchase != null) {
onSubscriptionFound(lastPurchase)
}
}
override fun onError(response: Int, e: java.lang.Exception) {
}
})
}
private fun checkIfPendingPurchases() {
billingRequests?.getAllPurchases(ProductTypes.IN_APP, object : RequestListener<Purchases> {
override fun onSuccess(purchases: Purchases) {

33
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
View file

@ -8,6 +8,7 @@ import android.view.ViewGroup
import androidx.core.view.isVisible
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.UserComponent
import com.habitrpg.android.habitica.data.ApiClient
import com.habitrpg.android.habitica.data.InventoryRepository
import com.habitrpg.android.habitica.data.UserRepository
import com.habitrpg.android.habitica.databinding.FragmentSubscriptionBinding
@ -26,6 +27,7 @@ import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionVi
import io.reactivex.functions.Consumer
import org.greenrobot.eventbus.Subscribe
import org.solovyev.android.checkout.Inventory
import org.solovyev.android.checkout.Purchase
import org.solovyev.android.checkout.Sku
import javax.inject.Inject
@ -40,6 +42,8 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
lateinit var appConfigManager: AppConfigManager
@Inject
lateinit var inventoryRepository: InventoryRepository
@Inject
lateinit var apiClient: ApiClient
private var selectedSubscriptionSku: Sku? = null
private var skus: List<Sku> = emptyList()
@ -48,6 +52,7 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
private var user: User? = null
private var hasLoadedSubscriptionOptions: Boolean = false
private var purchasedSubscription: Purchase? = null
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?): View? {
@ -82,17 +87,15 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
binding.refreshLayout.setOnRefreshListener { refresh() }
if (appConfigManager.useNewMysteryBenefits()) {
compositeSubscription.add(inventoryRepository.getLatestMysteryItem().subscribe(Consumer {
DataBindingUtils.loadImage(binding.subBenefitsMysteryItemIcon, "shop_set_mystery_${it.key?.split("_")?.last()}")
binding.subBenefitsMysteryItemText.text = context?.getString(R.string.subscribe_listitem3_description_new, it.text)
}, RxErrorHandler.handleEmptyError()))
}
compositeSubscription.add(inventoryRepository.getLatestMysteryItem().subscribe(Consumer {
DataBindingUtils.loadImage(binding.subBenefitsMysteryItemIcon, "shop_set_mystery_${it.key?.split("_")?.last()}")
binding.subBenefitsMysteryItemText.text = context?.getString(R.string.subscribe_listitem3_description_new, it.text)
}, RxErrorHandler.handleEmptyError()))
}
override fun onResume() {
super.onResume()
refresh();
refresh()
}
private fun refresh() {
@ -165,6 +168,11 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
override fun setPurchaseHandler(handler: PurchaseHandler?) {
this.purchaseHandler = handler
handler?.checkForSubscription {
purchasedSubscription = it
checkIfNeedsCancellation()
}
}
private fun purchaseSubscription() {
@ -178,6 +186,7 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
fun setUser(newUser: User) {
user = newUser
this.updateSubscriptionInfo()
checkIfNeedsCancellation()
}
private fun updateSubscriptionInfo() {
@ -208,10 +217,18 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
}
}
private fun checkIfNeedsCancellation() {
if (user?.purchased?.plan?.isActive == true) {
compositeSubscription.add(apiClient.cancelSubscription().subscribe(Consumer {
refresh()
}, RxErrorHandler.handleEmptyError()))
}
}
private fun showSubscriptionOptions() {
binding.subscriptionOptions.visibility = View.VISIBLE
binding.subscriptionOptions.postDelayed({
binding.scrollView.smoothScrollTo(0, binding.subscriptionOptions.top ?: 0)
binding.scrollView.smoothScrollTo(0, binding.subscriptionOptions.top)
}, 500)
}