Merge pull request #748 from mysteriumnetwork/feature/Pushy-clean-up

Remove all Pushy code from PlayStore flavor
mysteriumnetwork · Jan 13, 2023 · a957a88 · a957a88
2 parents 8e67eec + 416ba08
commit a957a88
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 199 deletions.
diff --git a/android/app/src/main/java/updated/mysterium/vpn/common/extensions/PushyExtensions.kt b/android/app/src/main/java/updated/mysterium/vpn/common/extensions/PushyExtensions.kt
diff --git a/android/app/src/main/java/updated/mysterium/vpn/common/playstore/NotificationsHelper.kt b/android/app/src/main/java/updated/mysterium/vpn/common/playstore/NotificationsHelper.kt
diff --git a/android/app/src/main/java/updated/mysterium/vpn/di/Modules.kt b/android/app/src/main/java/updated/mysterium/vpn/di/Modules.kt
@@ -102,7 +102,7 @@ object Modules {
         }
 
         single {
-            SplashViewModel(get(), get())
+            SplashViewModel(get())
         }
         viewModel {
             SearchViewModel()

diff --git a/android/app/src/main/java/updated/mysterium/vpn/model/pushy/PushyTopic.kt b/android/app/src/main/java/updated/mysterium/vpn/model/pushy/PushyTopic.kt
diff --git a/android/app/src/main/java/updated/mysterium/vpn/ui/base/BaseActivity.kt b/android/app/src/main/java/updated/mysterium/vpn/ui/base/BaseActivity.kt
@@ -19,17 +19,14 @@ import network.mysterium.vpn.databinding.PopUpRetryRegistrationBinding
 import network.mysterium.vpn.databinding.PopUpTopUpAccountBinding
 import network.mysterium.vpn.databinding.PopUpWiFiErrorBinding
 import org.koin.android.ext.android.inject
-import org.koin.java.KoinJavaComponent.injectOrNull
 import updated.mysterium.vpn.common.Flavors
 import updated.mysterium.vpn.common.extensions.TAG
 import updated.mysterium.vpn.common.extensions.observeOnce
 import updated.mysterium.vpn.common.localisation.LocaleHelper
-import updated.mysterium.vpn.common.playstore.NotificationsHelper
 import updated.mysterium.vpn.model.connection.ConnectionType
 import updated.mysterium.vpn.model.manual.connect.ConnectionState
 import updated.mysterium.vpn.model.manual.connect.Proposal
 import updated.mysterium.vpn.model.payment.PaymentOption
-import updated.mysterium.vpn.model.pushy.PushyTopic
 import updated.mysterium.vpn.ui.base.BaseViewModel.Companion.CONNECT_BALANCE_LIMIT
 import updated.mysterium.vpn.ui.connection.ConnectionActivity
 import updated.mysterium.vpn.ui.custom.view.ConnectionToolbar
@@ -48,7 +45,6 @@ abstract class BaseActivity : AppCompatActivity() {
     protected var connectionStateToolbar: ConnectionToolbar? = null
     protected val baseViewModel: BaseViewModel by inject()
     private val homeSelectionViewModel: HomeSelectionViewModel by inject()
-    protected val pushyNotifications: NotificationsHelper? by injectOrNull(NotificationsHelper::class.java)
     protected var isInternetAvailable = true
     protected var connectionState = ConnectionState.NOTCONNECTED
     private val dialogs = emptyList<Dialog>().toMutableList()
@@ -187,13 +183,6 @@ abstract class BaseActivity : AppCompatActivity() {
     }
 
     private fun subscribeViewModel() {
-        baseViewModel.balance.observe(this) {
-            if (it < BaseViewModel.BALANCE_LIMIT) {
-                pushyNotifications?.subscribe(PushyTopic.LESS_THEN_HALF_MYST)
-            } else {
-                pushyNotifications?.unsubscribe(PushyTopic.LESS_THEN_HALF_MYST)
-            }
-        }
         baseViewModel.balanceRunningOut.observe(this) {
             balanceRunningOutPopUp()
         }

diff --git a/android/app/src/main/java/updated/mysterium/vpn/ui/home/selection/HomeSelectionActivity.kt b/android/app/src/main/java/updated/mysterium/vpn/ui/home/selection/HomeSelectionActivity.kt
@@ -74,7 +74,6 @@ class HomeSelectionActivity : BaseActivity() {
         initFiltersList()
         initCountriesList()
         viewModel.initConnectionListener()
-        subscribeToResidentCountry()
         intent.extras?.get(SHOW_PAYMENT_PROCESSING_BANNER_KEY)?.let {
             showPaymentProcessingBanner()
         }
@@ -116,14 +115,6 @@ class HomeSelectionActivity : BaseActivity() {
         }
     }
 
-    private fun subscribeToResidentCountry() {
-        viewModel.getResidentCountry().observe(this) {
-            it.onSuccess { country ->
-                pushyNotifications?.subscribe(country)
-            }
-        }
-    }
-
     private fun handleConnectionState(connection: ConnectionState) {
         when (connection) {
             ConnectionState.NOTCONNECTED -> {

diff --git a/android/app/src/main/java/updated/mysterium/vpn/ui/prepare/top/up/PrepareTopUpActivity.kt b/android/app/src/main/java/updated/mysterium/vpn/ui/prepare/top/up/PrepareTopUpActivity.kt
@@ -9,7 +9,6 @@ import network.mysterium.vpn.databinding.ActivityPrepareTopUpBinding
 import network.mysterium.vpn.databinding.PopUpRetryRegistrationBinding
 import org.koin.android.ext.android.inject
 import updated.mysterium.vpn.common.extensions.TAG
-import updated.mysterium.vpn.model.pushy.PushyTopic
 import updated.mysterium.vpn.ui.base.BaseActivity
 import updated.mysterium.vpn.ui.base.RegistrationViewModel
 import updated.mysterium.vpn.ui.home.selection.HomeSelectionActivity
@@ -84,7 +83,6 @@ class PrepareTopUpActivity : BaseActivity() {
     private fun registerIdentityWithToken(token: String) {
         registrationViewModel.registerIdentityWithToken(token).observe(this) {
             it.onSuccess {
-                pushyNotifications?.subscribe(PushyTopic.REFERRAL_CODE_USED)
                 isReferralTokenUsed = true
                 binding.referralProgram.visibility = View.GONE
                 dialog.dismiss()

diff --git a/android/app/src/main/java/updated/mysterium/vpn/ui/splash/SplashActivity.kt b/android/app/src/main/java/updated/mysterium/vpn/ui/splash/SplashActivity.kt
@@ -22,7 +22,6 @@ import updated.mysterium.vpn.analytics.mysterium.MysteriumAnalytic
 import updated.mysterium.vpn.common.animation.OnAnimationCompletedListener
 import updated.mysterium.vpn.common.network.NetworkUtil
 import updated.mysterium.vpn.model.manual.connect.ConnectionState
-import updated.mysterium.vpn.model.pushy.PushyTopic
 import updated.mysterium.vpn.ui.balance.BalanceViewModel
 import updated.mysterium.vpn.ui.base.AllNodesViewModel
 import updated.mysterium.vpn.ui.base.BaseActivity
@@ -66,7 +65,6 @@ class SplashActivity : BaseActivity() {
         ensureVpnServicePermission()
         configure()
         subscribeViewModel()
-        setUpPushyNotifications()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -159,21 +157,6 @@ class SplashActivity : BaseActivity() {
         }
     }
 
-    private fun setUpPushyNotifications() {
-        viewModel.setUpInactiveUserPushyNotifications()
-        pushyNotifications?.register {
-            val lastCurrency = viewModel.getLastCryptoCurrency()
-            if (lastCurrency == null) {
-                pushyNotifications?.subscribe(PushyTopic.PAYMENT_FALSE)
-            } else {
-                pushyNotifications?.unsubscribe(PushyTopic.PAYMENT_FALSE)
-                pushyNotifications?.subscribe(PushyTopic.PAYMENT_TRUE)
-                pushyNotifications?.subscribe(lastCurrency)
-            }
-        }
-        pushyNotifications?.listen()
-    }
-
     private fun navigateForward(redirectedFromPush: Boolean) {
         when {
             !viewModel.isUserAlreadyLogin() -> {

diff --git a/android/app/src/main/java/updated/mysterium/vpn/ui/splash/SplashViewModel.kt b/android/app/src/main/java/updated/mysterium/vpn/ui/splash/SplashViewModel.kt
@@ -5,8 +5,6 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import androidx.work.OneTimeWorkRequest
-import androidx.work.WorkManager
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.Dispatchers
@@ -16,13 +14,8 @@ import updated.mysterium.vpn.common.livedata.SingleLiveEvent
 import updated.mysterium.vpn.core.DeferredNode
 import updated.mysterium.vpn.core.MysteriumCoreService
 import updated.mysterium.vpn.network.provider.usecase.UseCaseProvider
-import updated.mysterium.vpn.notification.ReviveUserWork
-import java.util.concurrent.TimeUnit
 
-class SplashViewModel(
-    useCaseProvider: UseCaseProvider,
-    private val workManager: WorkManager
-) : ViewModel() {
+class SplashViewModel(useCaseProvider: UseCaseProvider) : ViewModel() {
 
     val navigateForward: LiveData<Unit>
         get() = _navigateForward
@@ -121,36 +114,4 @@ class SplashViewModel(
     fun getUserSavedMode() = settingsUseCase.getUserDarkMode()
 
     fun getLastCryptoCurrency() = pushyUseCase.getCryptoCurrency()
-
-    fun setUpInactiveUserPushyNotifications() {
-        val firstNotificationWork =
-            OneTimeWorkRequest
-                .Builder(ReviveUserWork::class.java)
-                .setInitialDelay(7, TimeUnit.DAYS)
-                .addTag(ReviveUserWork.WEEK_DELAY_NOTIFICATION)
-                .build()
-
-        val secondNotificationWork =
-            OneTimeWorkRequest
-                .Builder(ReviveUserWork::class.java)
-                .setInitialDelay(7, TimeUnit.DAYS)
-                .addTag(ReviveUserWork.TWO_WEEKS_DELAY_NOTIFICATION)
-                .build()
-
-        val lastNotificationWork =
-            OneTimeWorkRequest
-                .Builder(ReviveUserWork::class.java)
-                .setInitialDelay(14, TimeUnit.DAYS)
-                .addTag(ReviveUserWork.MONTH_DELAY_NOTIFICATION)
-                .build()
-
-        workManager.cancelAllWork()
-
-        workManager
-            .beginWith(firstNotificationWork)
-            .then(secondNotificationWork)
-            .then(lastNotificationWork)
-            .enqueue()
-
-    }
 }
diff --git a/android/app/src/playstore/java/updated/mysterium/vpn/di/FlavorModules.kt b/android/app/src/playstore/java/updated/mysterium/vpn/di/FlavorModules.kt
@@ -4,9 +4,7 @@ import org.koin.android.ext.koin.androidApplication
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module
 import updated.mysterium.vpn.common.PlayStoreHelperImpl
-import updated.mysterium.vpn.common.playstore.NotificationsHelper
 import updated.mysterium.vpn.common.playstore.PlayStoreHelper
-import updated.mysterium.vpn.notification.Notifications
 import updated.mysterium.vpn.ui.top.up.play.billing.amount.usd.PlayBillingAmountUsdViewModel
 import updated.mysterium.vpn.ui.top.up.play.billing.summary.PlayBillingDataSource
 import updated.mysterium.vpn.ui.top.up.play.billing.summary.PlayBillingSummaryViewModel
@@ -26,9 +24,6 @@ object FlavorModules {
         single<PlayStoreHelper> {
             PlayStoreHelperImpl(get())
         }
-        single<NotificationsHelper> {
-            Notifications(androidApplication())
-        }
     }
 }
 
diff --git a/android/app/src/playstore/java/updated/mysterium/vpn/notification/Notifications.kt b/android/app/src/playstore/java/updated/mysterium/vpn/notification/Notifications.kt
diff --git a/...e/java/updated/mysterium/vpn/ui/top/up/play/billing/summary/PlayBillingSummaryActivity.kt b/...e/java/updated/mysterium/vpn/ui/top/up/play/billing/summary/PlayBillingSummaryActivity.kt
@@ -8,7 +8,6 @@ import updated.mysterium.vpn.exceptions.BaseNetworkException
 import updated.mysterium.vpn.model.payment.OrderRequestInfo
 import updated.mysterium.vpn.model.payment.PaymentStatus
 import updated.mysterium.vpn.model.payment.PlayBillingOrderRequestInfo
-import updated.mysterium.vpn.model.pushy.PushyTopic
 import updated.mysterium.vpn.model.top.up.TopUpPlayBillingCardItem
 import updated.mysterium.vpn.ui.top.up.select.country.SelectCountryActivity
 import updated.mysterium.vpn.ui.top.up.summary.SummaryActivity
@@ -84,9 +83,6 @@ class PlayBillingSummaryActivity : SummaryActivity() {
 
     private fun paymentConfirmed() {
         setButtonAvailability(true)
-        pushyNotifications?.unsubscribe(PushyTopic.PAYMENT_FALSE)
-        pushyNotifications?.subscribe(PushyTopic.PAYMENT_TRUE)
-        pushyNotifications?.subscribe("USD")
         viewModel.clearPopUpTopUpHistory()
         registerAccount()
     }