summaryrefslogtreecommitdiffhomepage
path: root/android/lib/billing
diff options
context:
space:
mode:
authorDavid Göransson <david.goransson@mullvad.net>2024-10-03 09:22:35 +0200
committerDavid Göransson <david.goransson@mullvad.net>2024-10-03 09:22:35 +0200
commit1364302d5d02858150acf21d4e36f1501fd296e1 (patch)
treedf5c5bd6ee2296448eba0762b4a80370eb906ac8 /android/lib/billing
parent50714d904e3fff7e74a1923e9118c32aa60737ff (diff)
parentd78b533b6c24d287531fa92d4825f70cdb1868e4 (diff)
downloadmullvadvpn-1364302d5d02858150acf21d4e36f1501fd296e1.tar.xz
mullvadvpn-1364302d5d02858150acf21d4e36f1501fd296e1.zip
Merge branch 'upgrade-compiler-warnings-to-errors-droid-1301'
Diffstat (limited to 'android/lib/billing')
-rw-r--r--android/lib/billing/build.gradle.kts5
-rw-r--r--android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepository.kt5
2 files changed, 8 insertions, 2 deletions
diff --git a/android/lib/billing/build.gradle.kts b/android/lib/billing/build.gradle.kts
index e6753a306a..46554cf956 100644
--- a/android/lib/billing/build.gradle.kts
+++ b/android/lib/billing/build.gradle.kts
@@ -20,7 +20,10 @@ android {
targetCompatibility = JavaVersion.VERSION_17
}
- kotlinOptions { jvmTarget = Versions.jvmTarget }
+ kotlinOptions {
+ jvmTarget = Versions.jvmTarget
+ allWarningsAsErrors = true
+ }
lint {
lintConfig = file("${rootProject.projectDir}/config/lint.xml")
diff --git a/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepository.kt b/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepository.kt
index 9ccd1d77ff..77eaea03a6 100644
--- a/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepository.kt
+++ b/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepository.kt
@@ -7,6 +7,7 @@ import com.android.billingclient.api.BillingClient.BillingResponseCode
import com.android.billingclient.api.BillingClientStateListener
import com.android.billingclient.api.BillingFlowParams
import com.android.billingclient.api.BillingResult
+import com.android.billingclient.api.PendingPurchasesParams
import com.android.billingclient.api.ProductDetails
import com.android.billingclient.api.ProductDetailsResult
import com.android.billingclient.api.PurchasesResult
@@ -62,7 +63,9 @@ class BillingRepository(context: Context) {
init {
billingClient =
BillingClient.newBuilder(context)
- .enablePendingPurchases()
+ .enablePendingPurchases(
+ PendingPurchasesParams.newBuilder().enableOneTimeProducts().build()
+ )
.setListener(purchaseUpdateListener)
.build()
}