Skip to content

Commit 8928894

Browse files
committed
Change custom exceptions definition to be class vs object
1 parent a55c2d5 commit 8928894

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

‎modules/base-android/src/main/java/tm/alashow/base/billing/SubscriptionErrors.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ open class SubscriptionError(val qonversionError: QonversionError) : Throwable()
1616
override fun toString() = qonversionError.toString()
1717
}
1818

19-
object SubscriptionNoEntitlementsError : SubscriptionError(QonversionError(QonversionErrorCode.ProductNotOwned)) {
19+
class SubscriptionNoEntitlementsError : SubscriptionError(QonversionError(QonversionErrorCode.ProductNotOwned)) {
2020
override fun toUiMessage() = UiMessage.Resource(R.string.subscriptions_required)
2121
}
2222

23-
object SubscriptionsNotEnabledError : Throwable(message = "Subscriptions not enabled")
23+
class SubscriptionsNotEnabledError : Throwable(message = "Subscriptions not enabled")

‎modules/base-android/src/main/java/tm/alashow/base/billing/Subscriptions.kt‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,9 @@ object Subscriptions {
4141
private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
4242

4343
private fun validateKey() {
44-
if (KEY.isBlank())
45-
throw SubscriptionsNotEnabledError
44+
if (KEY.isBlank()) {
45+
throw SubscriptionsNotEnabledError()
46+
}
4647
}
4748

4849
enum class Product(val id: String) {
@@ -81,7 +82,7 @@ object Subscriptions {
8182
} else if (restoreOrPurchaseOnEmpty) {
8283
Timber.d("Has no entitlement: $entitlement, trying to restore..")
8384
restoreEntitlement(context, product, entitlement, true, onEntitlementActive, onEntitlementError)
84-
} else onEntitlementError(SubscriptionNoEntitlementsError)
85+
} else onEntitlementError(SubscriptionNoEntitlementsError())
8586
}
8687

8788
override fun onError(error: QonversionError) {
@@ -139,7 +140,7 @@ object Subscriptions {
139140
val premiumEntitlement = entitlements[entitlement.id]
140141
if (premiumEntitlement != null && premiumEntitlement.isActive) {
141142
onEntitlementActive(premiumEntitlement)
142-
} else onEntitlementError(SubscriptionNoEntitlementsError)
143+
} else onEntitlementError(SubscriptionNoEntitlementsError())
143144
}
144145

145146
override fun onError(error: QonversionError) {
@@ -183,7 +184,7 @@ object Subscriptions {
183184
Timber.d("Has entitlement: $premiumEntitlement")
184185
if (premiumEntitlement != null && premiumEntitlement.isActiveAndNotExpired()) {
185186
continuation.resume(premiumEntitlement)
186-
} else continuation.resumeWithException(SubscriptionNoEntitlementsError)
187+
} else continuation.resumeWithException(SubscriptionNoEntitlementsError())
187188
}
188189

189190
override fun onError(error: QonversionError) {

0 commit comments

Comments
 (0)