Don't include google billing or installReferrer in noAnalytics build

This commit is contained in:
Moez Bhatti
2021-02-01 21:16:21 -05:00
parent bb8ad1ee57
commit ff4170af32
18 changed files with 174 additions and 41 deletions
+2 -1
View File
@@ -81,7 +81,6 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:$coroutines_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:$coroutines_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-reactive:$coroutines_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-reactive:$coroutines_version"
implementation 'com.android.installreferrer:installreferrer:1.1'
implementation 'com.callcontrol:datashare:1.2.0' implementation 'com.callcontrol:datashare:1.2.0'
implementation "com.f2prateek.rx.preferences2:rx-preferences:$rx_preferences_version" implementation "com.f2prateek.rx.preferences2:rx-preferences:$rx_preferences_version"
implementation "com.jakewharton.timber:timber:$timber_version" implementation "com.jakewharton.timber:timber:$timber_version"
@@ -92,6 +91,8 @@ dependencies {
implementation project(":android-smsmms") implementation project(":android-smsmms")
implementation project(':common') implementation project(':common')
implementation project(':domain') implementation project(':domain')
withAnalyticsImplementation 'com.android.installreferrer:installreferrer:1.1'
withAnalyticsImplementation "com.amplitude:android-sdk:2.16.0" withAnalyticsImplementation "com.amplitude:android-sdk:2.16.0"
} }
@@ -0,0 +1,33 @@
/*
* Copyright (C) 2020 Moez Bhatti <moez.bhatti@gmail.com>
*
* This file is part of QKSMS.
*
* QKSMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* QKSMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
*/
package com.moez.QKSMS.manager
import android.content.Context
import com.moez.QKSMS.util.Preferences
import kotlinx.coroutines.suspendCancellableCoroutine
import javax.inject.Inject
import kotlin.coroutines.resume
class ReferralManagerImpl @Inject constructor() : ReferralManager {
override suspend fun trackReferrer() {
}
}
@@ -1,3 +1,22 @@
/*
* Copyright (C) 2020 Moez Bhatti <moez.bhatti@gmail.com>
*
* This file is part of QKSMS.
*
* QKSMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* QKSMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
*/
package com.moez.QKSMS.manager package com.moez.QKSMS.manager
import android.content.Context import android.content.Context
@@ -0,0 +1,43 @@
/*
* Copyright (C) 2020 Moez Bhatti <moez.bhatti@gmail.com>
*
* This file is part of QKSMS.
*
* QKSMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* QKSMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
*/
package com.moez.QKSMS.manager
import android.app.Activity
import io.reactivex.Observable
interface BillingManager {
companion object {
const val SKU_PLUS = "remove_ads"
const val SKU_PLUS_DONATE = "qksms_plus_donate"
}
data class Product(
val sku: String,
val price: String,
val priceCurrencyCode: String
)
val products: Observable<List<Product>>
val upgradeStatus: Observable<Boolean>
fun initiatePurchaseFlow(activity: Activity, sku: String)
}
+1 -1
View File
@@ -173,7 +173,6 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:$coroutines_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:$coroutines_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-reactive:$coroutines_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-reactive:$coroutines_version"
implementation "com.android.billingclient:billing:1.0"
implementation "com.github.chrisbanes:PhotoView:2.0.0" implementation "com.github.chrisbanes:PhotoView:2.0.0"
implementation "com.f2prateek.rx.preferences2:rx-preferences:$rx_preferences_version" implementation "com.f2prateek.rx.preferences2:rx-preferences:$rx_preferences_version"
implementation "com.google.android:flexbox:0.3.1" implementation "com.google.android:flexbox:0.3.1"
@@ -187,6 +186,7 @@ dependencies {
implementation project(':domain') implementation project(':domain')
withAnalyticsImplementation 'com.google.firebase:firebase-crashlytics:17.3.0' withAnalyticsImplementation 'com.google.firebase:firebase-crashlytics:17.3.0'
withAnalyticsImplementation "com.android.billingclient:billing:1.0"
noAnalyticsDebug project(path: ':data', configuration: 'noAnalyticsDebug') noAnalyticsDebug project(path: ':data', configuration: 'noAnalyticsDebug')
noAnalyticsRelease project(path: ':data', configuration: 'noAnalyticsRelease') noAnalyticsRelease project(path: ':data', configuration: 'noAnalyticsRelease')
@@ -31,7 +31,6 @@ import android.provider.Telephony
import android.webkit.MimeTypeMap import android.webkit.MimeTypeMap
import androidx.core.content.FileProvider import androidx.core.content.FileProvider
import com.moez.QKSMS.BuildConfig import com.moez.QKSMS.BuildConfig
import com.moez.QKSMS.common.util.BillingManager
import com.moez.QKSMS.feature.backup.BackupActivity import com.moez.QKSMS.feature.backup.BackupActivity
import com.moez.QKSMS.feature.blocking.BlockingActivity import com.moez.QKSMS.feature.blocking.BlockingActivity
import com.moez.QKSMS.feature.compose.ComposeActivity import com.moez.QKSMS.feature.compose.ComposeActivity
@@ -42,6 +41,7 @@ import com.moez.QKSMS.feature.plus.PlusActivity
import com.moez.QKSMS.feature.scheduled.ScheduledActivity import com.moez.QKSMS.feature.scheduled.ScheduledActivity
import com.moez.QKSMS.feature.settings.SettingsActivity import com.moez.QKSMS.feature.settings.SettingsActivity
import com.moez.QKSMS.manager.AnalyticsManager import com.moez.QKSMS.manager.AnalyticsManager
import com.moez.QKSMS.manager.BillingManager
import com.moez.QKSMS.manager.NotificationManager import com.moez.QKSMS.manager.NotificationManager
import com.moez.QKSMS.manager.PermissionManager import com.moez.QKSMS.manager.PermissionManager
import java.io.File import java.io.File
@@ -22,10 +22,10 @@ import android.content.Context
import com.moez.QKSMS.R import com.moez.QKSMS.R
import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.Navigator
import com.moez.QKSMS.common.base.QkPresenter import com.moez.QKSMS.common.base.QkPresenter
import com.moez.QKSMS.common.util.BillingManager
import com.moez.QKSMS.common.util.DateFormatter import com.moez.QKSMS.common.util.DateFormatter
import com.moez.QKSMS.common.util.extensions.makeToast import com.moez.QKSMS.common.util.extensions.makeToast
import com.moez.QKSMS.interactor.PerformBackup import com.moez.QKSMS.interactor.PerformBackup
import com.moez.QKSMS.manager.BillingManager
import com.moez.QKSMS.manager.PermissionManager import com.moez.QKSMS.manager.PermissionManager
import com.moez.QKSMS.repository.BackupRepository import com.moez.QKSMS.repository.BackupRepository
import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.android.lifecycle.scope
@@ -27,7 +27,6 @@ import androidx.core.content.getSystemService
import com.moez.QKSMS.R import com.moez.QKSMS.R
import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.Navigator
import com.moez.QKSMS.common.base.QkViewModel import com.moez.QKSMS.common.base.QkViewModel
import com.moez.QKSMS.common.util.BillingManager
import com.moez.QKSMS.common.util.ClipboardUtils import com.moez.QKSMS.common.util.ClipboardUtils
import com.moez.QKSMS.common.util.MessageDetailsFormatter import com.moez.QKSMS.common.util.MessageDetailsFormatter
import com.moez.QKSMS.common.util.extensions.makeToast import com.moez.QKSMS.common.util.extensions.makeToast
@@ -44,6 +43,7 @@ import com.moez.QKSMS.interactor.MarkRead
import com.moez.QKSMS.interactor.RetrySending import com.moez.QKSMS.interactor.RetrySending
import com.moez.QKSMS.interactor.SendMessage import com.moez.QKSMS.interactor.SendMessage
import com.moez.QKSMS.manager.ActiveConversationManager import com.moez.QKSMS.manager.ActiveConversationManager
import com.moez.QKSMS.manager.BillingManager
import com.moez.QKSMS.manager.PermissionManager import com.moez.QKSMS.manager.PermissionManager
import com.moez.QKSMS.model.Attachment import com.moez.QKSMS.model.Attachment
import com.moez.QKSMS.model.Attachments import com.moez.QKSMS.model.Attachments
@@ -22,7 +22,6 @@ import androidx.recyclerview.widget.ItemTouchHelper
import com.moez.QKSMS.R import com.moez.QKSMS.R
import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.Navigator
import com.moez.QKSMS.common.base.QkViewModel import com.moez.QKSMS.common.base.QkViewModel
import com.moez.QKSMS.common.util.BillingManager
import com.moez.QKSMS.extensions.mapNotNull import com.moez.QKSMS.extensions.mapNotNull
import com.moez.QKSMS.interactor.DeleteConversations import com.moez.QKSMS.interactor.DeleteConversations
import com.moez.QKSMS.interactor.MarkAllSeen import com.moez.QKSMS.interactor.MarkAllSeen
@@ -36,6 +35,7 @@ import com.moez.QKSMS.interactor.MigratePreferences
import com.moez.QKSMS.interactor.SyncContacts import com.moez.QKSMS.interactor.SyncContacts
import com.moez.QKSMS.interactor.SyncMessages import com.moez.QKSMS.interactor.SyncMessages
import com.moez.QKSMS.listener.ContactAddedListener import com.moez.QKSMS.listener.ContactAddedListener
import com.moez.QKSMS.manager.BillingManager
import com.moez.QKSMS.manager.ChangelogManager import com.moez.QKSMS.manager.ChangelogManager
import com.moez.QKSMS.manager.PermissionManager import com.moez.QKSMS.manager.PermissionManager
import com.moez.QKSMS.manager.RatingManager import com.moez.QKSMS.manager.RatingManager
@@ -27,7 +27,6 @@ import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.BuildConfig import com.moez.QKSMS.BuildConfig
import com.moez.QKSMS.R import com.moez.QKSMS.R
import com.moez.QKSMS.common.base.QkThemedActivity import com.moez.QKSMS.common.base.QkThemedActivity
import com.moez.QKSMS.common.util.BillingManager
import com.moez.QKSMS.common.util.FontProvider import com.moez.QKSMS.common.util.FontProvider
import com.moez.QKSMS.common.util.extensions.resolveThemeColor import com.moez.QKSMS.common.util.extensions.resolveThemeColor
import com.moez.QKSMS.common.util.extensions.setBackgroundTint import com.moez.QKSMS.common.util.extensions.setBackgroundTint
@@ -37,6 +36,7 @@ import com.moez.QKSMS.common.util.extensions.viewBinding
import com.moez.QKSMS.common.widget.PreferenceView import com.moez.QKSMS.common.widget.PreferenceView
import com.moez.QKSMS.databinding.QksmsPlusActivityBinding import com.moez.QKSMS.databinding.QksmsPlusActivityBinding
import com.moez.QKSMS.feature.plus.experiment.UpgradeButtonExperiment import com.moez.QKSMS.feature.plus.experiment.UpgradeButtonExperiment
import com.moez.QKSMS.manager.BillingManager
import dagger.android.AndroidInjection import dagger.android.AndroidInjection
import javax.inject.Inject import javax.inject.Inject
@@ -19,7 +19,7 @@
package com.moez.QKSMS.feature.plus package com.moez.QKSMS.feature.plus
import com.moez.QKSMS.common.base.QkView import com.moez.QKSMS.common.base.QkView
import com.moez.QKSMS.common.util.BillingManager import com.moez.QKSMS.manager.BillingManager
import io.reactivex.Observable import io.reactivex.Observable
interface PlusView : QkView<PlusState> { interface PlusView : QkView<PlusState> {
@@ -20,8 +20,8 @@ package com.moez.QKSMS.feature.plus
import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.Navigator
import com.moez.QKSMS.common.base.QkViewModel import com.moez.QKSMS.common.base.QkViewModel
import com.moez.QKSMS.common.util.BillingManager
import com.moez.QKSMS.manager.AnalyticsManager import com.moez.QKSMS.manager.AnalyticsManager
import com.moez.QKSMS.manager.BillingManager
import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.autoDisposable import com.uber.autodispose.autoDisposable
import io.reactivex.Observable import io.reactivex.Observable
@@ -84,4 +84,4 @@ class PlusViewModel @Inject constructor(
.subscribe { navigator.showSettings() } .subscribe { navigator.showSettings() }
} }
} }
@@ -22,11 +22,10 @@ import android.content.Context
import com.moez.QKSMS.R import com.moez.QKSMS.R
import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.Navigator
import com.moez.QKSMS.common.base.QkViewModel import com.moez.QKSMS.common.base.QkViewModel
import com.moez.QKSMS.common.util.BillingManager
import com.moez.QKSMS.common.util.ClipboardUtils import com.moez.QKSMS.common.util.ClipboardUtils
import com.moez.QKSMS.common.util.extensions.makeToast import com.moez.QKSMS.common.util.extensions.makeToast
import com.moez.QKSMS.interactor.SendScheduledMessage import com.moez.QKSMS.interactor.SendScheduledMessage
import com.moez.QKSMS.repository.MessageRepository import com.moez.QKSMS.manager.BillingManager
import com.moez.QKSMS.repository.ScheduledMessageRepository import com.moez.QKSMS.repository.ScheduledMessageRepository
import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.autoDisposable import com.uber.autodispose.autoDisposable
@@ -37,7 +36,6 @@ import javax.inject.Inject
class ScheduledViewModel @Inject constructor( class ScheduledViewModel @Inject constructor(
billingManager: BillingManager, billingManager: BillingManager,
private val context: Context, private val context: Context,
private val messageRepo: MessageRepository,
private val navigator: Navigator, private val navigator: Navigator,
private val scheduledMessageRepo: ScheduledMessageRepository, private val scheduledMessageRepo: ScheduledMessageRepository,
private val sendScheduledMessage: SendScheduledMessage private val sendScheduledMessage: SendScheduledMessage
@@ -22,13 +22,13 @@ import android.content.Context
import com.moez.QKSMS.R import com.moez.QKSMS.R
import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.Navigator
import com.moez.QKSMS.common.base.QkPresenter import com.moez.QKSMS.common.base.QkPresenter
import com.moez.QKSMS.common.util.BillingManager
import com.moez.QKSMS.common.util.Colors import com.moez.QKSMS.common.util.Colors
import com.moez.QKSMS.common.util.DateFormatter import com.moez.QKSMS.common.util.DateFormatter
import com.moez.QKSMS.common.util.extensions.makeToast import com.moez.QKSMS.common.util.extensions.makeToast
import com.moez.QKSMS.interactor.DeleteOldMessages import com.moez.QKSMS.interactor.DeleteOldMessages
import com.moez.QKSMS.interactor.SyncMessages import com.moez.QKSMS.interactor.SyncMessages
import com.moez.QKSMS.manager.AnalyticsManager import com.moez.QKSMS.manager.AnalyticsManager
import com.moez.QKSMS.manager.BillingManager
import com.moez.QKSMS.repository.MessageRepository import com.moez.QKSMS.repository.MessageRepository
import com.moez.QKSMS.repository.SyncRepository import com.moez.QKSMS.repository.SyncRepository
import com.moez.QKSMS.service.AutoDeleteService import com.moez.QKSMS.service.AutoDeleteService
@@ -21,8 +21,8 @@ package com.moez.QKSMS.feature.themepicker
import com.f2prateek.rx.preferences2.Preference import com.f2prateek.rx.preferences2.Preference
import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.Navigator
import com.moez.QKSMS.common.base.QkPresenter import com.moez.QKSMS.common.base.QkPresenter
import com.moez.QKSMS.common.util.BillingManager
import com.moez.QKSMS.common.util.Colors import com.moez.QKSMS.common.util.Colors
import com.moez.QKSMS.manager.BillingManager
import com.moez.QKSMS.manager.WidgetManager import com.moez.QKSMS.manager.WidgetManager
import com.moez.QKSMS.util.Preferences import com.moez.QKSMS.util.Preferences
import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.android.lifecycle.scope
@@ -28,6 +28,7 @@ import com.f2prateek.rx.preferences2.RxSharedPreferences
import com.moez.QKSMS.blocking.BlockingClient import com.moez.QKSMS.blocking.BlockingClient
import com.moez.QKSMS.blocking.BlockingManager import com.moez.QKSMS.blocking.BlockingManager
import com.moez.QKSMS.common.ViewModelFactory import com.moez.QKSMS.common.ViewModelFactory
import com.moez.QKSMS.common.util.BillingManagerImpl
import com.moez.QKSMS.common.util.NotificationManagerImpl import com.moez.QKSMS.common.util.NotificationManagerImpl
import com.moez.QKSMS.common.util.ShortcutManagerImpl import com.moez.QKSMS.common.util.ShortcutManagerImpl
import com.moez.QKSMS.feature.conversationinfo.injection.ConversationInfoComponent import com.moez.QKSMS.feature.conversationinfo.injection.ConversationInfoComponent
@@ -40,6 +41,7 @@ import com.moez.QKSMS.manager.AlarmManager
import com.moez.QKSMS.manager.AlarmManagerImpl import com.moez.QKSMS.manager.AlarmManagerImpl
import com.moez.QKSMS.manager.AnalyticsManager import com.moez.QKSMS.manager.AnalyticsManager
import com.moez.QKSMS.manager.AnalyticsManagerImpl import com.moez.QKSMS.manager.AnalyticsManagerImpl
import com.moez.QKSMS.manager.BillingManager
import com.moez.QKSMS.manager.ChangelogManager import com.moez.QKSMS.manager.ChangelogManager
import com.moez.QKSMS.manager.ChangelogManagerImpl import com.moez.QKSMS.manager.ChangelogManagerImpl
import com.moez.QKSMS.manager.KeyManager import com.moez.QKSMS.manager.KeyManager
@@ -130,6 +132,9 @@ class AppModule(private var application: Application) {
// Manager // Manager
@Provides
fun provideBillingManager(manager: BillingManagerImpl): BillingManager = manager
@Provides @Provides
fun provideActiveConversationManager(manager: ActiveConversationManagerImpl): ActiveConversationManager = manager fun provideActiveConversationManager(manager: ActiveConversationManagerImpl): ActiveConversationManager = manager
@@ -0,0 +1,37 @@
/*
* Copyright (C) 2020 Moez Bhatti <moez.bhatti@gmail.com>
*
* This file is part of QKSMS.
*
* QKSMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* QKSMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
*/
package com.moez.QKSMS.common.util
import android.app.Activity
import com.moez.QKSMS.manager.BillingManager
import io.reactivex.Observable
import io.reactivex.subjects.BehaviorSubject
import javax.inject.Inject
import javax.inject.Singleton
@Singleton
class BillingManagerImpl @Inject constructor(
): BillingManager {
override val products: Observable<List<BillingManager.Product>> = BehaviorSubject.createDefault(listOf())
override val upgradeStatus: Observable<Boolean> = BehaviorSubject.createDefault(true)
override fun initiatePurchaseFlow(activity: Activity, sku: String) = Unit
}
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com> * Copyright (C) 2020 Moez Bhatti <moez.bhatti@gmail.com>
* *
* This file is part of QKSMS. * This file is part of QKSMS.
* *
@@ -16,21 +16,20 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>. * along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.moez.QKSMS.common.util package com.moez.QKSMS.common.util
import android.app.Activity import android.app.Activity
import android.content.Context import android.content.Context
import com.android.billingclient.api.BillingClient import com.android.billingclient.api.BillingClient
import com.android.billingclient.api.BillingClient.BillingResponse
import com.android.billingclient.api.BillingClient.SkuType
import com.android.billingclient.api.BillingClientStateListener import com.android.billingclient.api.BillingClientStateListener
import com.android.billingclient.api.BillingFlowParams import com.android.billingclient.api.BillingFlowParams
import com.android.billingclient.api.Purchase import com.android.billingclient.api.Purchase
import com.android.billingclient.api.PurchasesUpdatedListener import com.android.billingclient.api.PurchasesUpdatedListener
import com.android.billingclient.api.SkuDetails import com.android.billingclient.api.SkuDetails
import com.android.billingclient.api.SkuDetailsParams import com.android.billingclient.api.SkuDetailsParams
import com.moez.QKSMS.BuildConfig
import com.moez.QKSMS.manager.AnalyticsManager import com.moez.QKSMS.manager.AnalyticsManager
import com.moez.QKSMS.manager.BillingManager
import io.reactivex.Flowable import io.reactivex.Flowable
import io.reactivex.Observable import io.reactivex.Observable
import io.reactivex.schedulers.Schedulers import io.reactivex.schedulers.Schedulers
@@ -41,18 +40,18 @@ import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton
@Singleton @Singleton
class BillingManager @Inject constructor( class BillingManagerImpl @Inject constructor(
context: Context, context: Context,
private val analyticsManager: AnalyticsManager private val analyticsManager: AnalyticsManager
) : PurchasesUpdatedListener { ) : BillingManager, PurchasesUpdatedListener {
companion object { companion object {
const val SKU_PLUS = "remove_ads" const val SKU_PLUS = "remove_ads"
const val SKU_PLUS_DONATE = "qksms_plus_donate" const val SKU_PLUS_DONATE = "qksms_plus_donate"
} }
val products: Observable<List<SkuDetails>> = BehaviorSubject.create() override val products: Observable<List<BillingManager.Product>> = BehaviorSubject.create()
val upgradeStatus: Observable<Boolean> override val upgradeStatus: Observable<Boolean>
private val skus = listOf(SKU_PLUS, SKU_PLUS_DONATE) private val skus = listOf(SKU_PLUS, SKU_PLUS_DONATE)
private val purchaseListObservable = BehaviorSubject.create<List<Purchase>>() private val purchaseListObservable = BehaviorSubject.create<List<Purchase>>()
@@ -66,23 +65,19 @@ class BillingManager @Inject constructor(
querySkuDetailsAsync() querySkuDetailsAsync()
} }
upgradeStatus = when (BuildConfig.FLAVOR) { upgradeStatus = purchaseListObservable
"noAnalytics" -> BehaviorSubject.createDefault(true) .map { purchases -> purchases.any { it.sku == SKU_PLUS } || purchases.any { it.sku == SKU_PLUS_DONATE } }
.doOnNext { upgraded -> analyticsManager.setUserProperty("Upgraded", upgraded) }
else -> purchaseListObservable
.map { purchases -> purchases.any { it.sku == SKU_PLUS } || purchases.any { it.sku == SKU_PLUS_DONATE } }
.doOnNext { upgraded -> analyticsManager.setUserProperty("Upgraded", upgraded) }
}
} }
private fun queryPurchases() { private fun queryPurchases() {
executeServiceRequest { executeServiceRequest {
// Load the cached data // Load the cached data
purchaseListObservable.onNext(billingClient.queryPurchases(SkuType.INAPP).purchasesList.orEmpty()) purchaseListObservable.onNext(billingClient.queryPurchases(BillingClient.SkuType.INAPP).purchasesList.orEmpty())
// On a fresh device, the purchase might not be cached, and so we'll need to force a refresh // On a fresh device, the purchase might not be cached, and so we'll need to force a refresh
billingClient.queryPurchaseHistoryAsync(SkuType.INAPP) { _, _ -> billingClient.queryPurchaseHistoryAsync(BillingClient.SkuType.INAPP) { _, _ ->
purchaseListObservable.onNext(billingClient.queryPurchases(SkuType.INAPP).purchasesList.orEmpty()) purchaseListObservable.onNext(billingClient.queryPurchases(BillingClient.SkuType.INAPP).purchasesList.orEmpty())
} }
} }
} }
@@ -90,8 +85,8 @@ class BillingManager @Inject constructor(
private fun startServiceConnection(onSuccess: () -> Unit) { private fun startServiceConnection(onSuccess: () -> Unit) {
val listener = object : BillingClientStateListener { val listener = object : BillingClientStateListener {
override fun onBillingSetupFinished(@BillingResponse billingResponseCode: Int) { override fun onBillingSetupFinished(@BillingClient.BillingResponse billingResponseCode: Int) {
if (billingResponseCode == BillingResponse.OK) { if (billingResponseCode == BillingClient.BillingResponse.OK) {
isServiceConnected = true isServiceConnected = true
onSuccess() onSuccess()
} else { } else {
@@ -114,16 +109,18 @@ class BillingManager @Inject constructor(
executeServiceRequest { executeServiceRequest {
val subParams = SkuDetailsParams.newBuilder().setSkusList(skus).setType(BillingClient.SkuType.INAPP) val subParams = SkuDetailsParams.newBuilder().setSkusList(skus).setType(BillingClient.SkuType.INAPP)
billingClient.querySkuDetailsAsync(subParams.build()) { responseCode, skuDetailsList -> billingClient.querySkuDetailsAsync(subParams.build()) { responseCode, skuDetailsList ->
if (responseCode == BillingResponse.OK) { if (responseCode == BillingClient.BillingResponse.OK) {
(products as Subject).onNext(skuDetailsList) (products as Subject).onNext(skuDetailsList.map { skuDetails ->
BillingManager.Product(skuDetails.sku, skuDetails.price, skuDetails.priceCurrencyCode)
})
} }
} }
} }
} }
fun initiatePurchaseFlow(activity: Activity, sku: String) { override fun initiatePurchaseFlow(activity: Activity, sku: String) {
executeServiceRequest { executeServiceRequest {
val params = BillingFlowParams.newBuilder().setSku(sku).setType(SkuType.INAPP) val params = BillingFlowParams.newBuilder().setSku(sku).setType(BillingClient.SkuType.INAPP)
billingClient.launchBillingFlow(activity, params.build()) billingClient.launchBillingFlow(activity, params.build())
} }
} }
@@ -136,9 +133,9 @@ class BillingManager @Inject constructor(
} }
override fun onPurchasesUpdated(resultCode: Int, purchases: List<Purchase>?) { override fun onPurchasesUpdated(resultCode: Int, purchases: List<Purchase>?) {
if (resultCode == BillingResponse.OK) { if (resultCode == BillingClient.BillingResponse.OK) {
purchaseListObservable.onNext(purchases.orEmpty()) purchaseListObservable.onNext(purchases.orEmpty())
} }
} }
} }