Skip to content

Commit b2e3500

Browse files
committed
Minor cleanup
1 parent a65bf06 commit b2e3500

3 files changed

Lines changed: 23 additions & 19 deletions

File tree

presentation/src/main/java/org/cryptomator/presentation/service/PendingCallbackQueue.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ class PendingCallbackQueue<T> {
1111

1212
@Synchronized
1313
fun drainSnapshot(): List<(T) -> Unit>? {
14-
if (pending.isEmpty()) return null
14+
if (pending.isEmpty()) {
15+
return null
16+
}
1517
val snapshot = ArrayList(pending)
1618
pending.clear()
1719
return snapshot

presentation/src/main/java/org/cryptomator/presentation/service/RestoreOutcomeDialogObserver.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ class RestoreOutcomeDialogObserver(
1212

1313
override fun onActivityResumed(activity: Activity) {
1414
val kindName = sharedPreferencesHandler.pendingRestoreOutcome()
15-
if (kindName.isEmpty()) return
15+
if (kindName.isEmpty()) {
16+
return
17+
}
1618
sharedPreferencesHandler.clearPendingRestoreOutcome()
1719
val kind = runCatching { RestoreOutcome.Kind.valueOf(kindName) }.getOrNull()
1820
if (kind == null) {

presentation/src/playstoreiap/java/org/cryptomator/presentation/service/IapBillingService.kt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -142,34 +142,34 @@ class IapBillingService : Service(), PurchasesUpdatedListener {
142142
}
143143

144144
doQuery(
145-
QueryProductDetailsParams.newBuilder().setProductList(listOf(
146-
QueryProductDetailsParams.Product.newBuilder()
147-
.setProductId(ProductInfo.PRODUCT_FULL_VERSION)
148-
.setProductType(BillingClient.ProductType.INAPP)
149-
.build()
150-
)).build()
145+
QueryProductDetailsParams.newBuilder().setProductList(
146+
listOf(
147+
QueryProductDetailsParams.Product.newBuilder()
148+
.setProductId(ProductInfo.PRODUCT_FULL_VERSION)
149+
.setProductType(BillingClient.ProductType.INAPP)
150+
.build()
151+
)
152+
).build()
151153
) { it.oneTimePurchaseOfferDetails?.formattedPrice ?: "" }
152154

153155
// Query SUBS products (must be separate — Billing Library requires same product type per query)
154156
doQuery(
155-
QueryProductDetailsParams.newBuilder().setProductList(listOf(
156-
QueryProductDetailsParams.Product.newBuilder()
157-
.setProductId(ProductInfo.PRODUCT_YEARLY_SUBSCRIPTION)
158-
.setProductType(BillingClient.ProductType.SUBS)
159-
.build()
160-
)).build()
157+
QueryProductDetailsParams.newBuilder().setProductList(
158+
listOf(
159+
QueryProductDetailsParams.Product.newBuilder()
160+
.setProductId(ProductInfo.PRODUCT_YEARLY_SUBSCRIPTION)
161+
.setProductType(BillingClient.ProductType.SUBS)
162+
.build()
163+
)
164+
).build()
161165
) { it.subscriptionOfferDetails?.firstOrNull()?.pricingPhases?.pricingPhaseList?.firstOrNull()?.formattedPrice ?: "" }
162166
}
163167

164168
fun launchPurchaseFlow(activity: WeakReference<Activity>, productId: String) {
165169
val details = productDetailsMap[productId]
166170
if (details == null) {
167171
Timber.tag("IapBillingService").w("Product details not loaded for %s", productId)
168-
activity.get()?.let { act ->
169-
act.runOnUiThread {
170-
Toast.makeText(act, R.string.error_purchase_not_available, Toast.LENGTH_SHORT).show()
171-
}
172-
}
172+
Toast.makeText(act, R.string.error_purchase_not_available, Toast.LENGTH_SHORT).show()
173173
return
174174
}
175175
val paramsBuilder = ProductDetailsParams.newBuilder().setProductDetails(details)

0 commit comments

Comments
 (0)