Add ability to turn off and delete backups.

app/src/main/java/org/thoughtcrime/securesms/badges/self/none/BecomeASustainerFragment.kt

@@ -12,18 +12,12 @@ import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
 import org.thoughtcrime.securesms.components.settings.DSLSettingsBottomSheetFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
 import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
-import org.thoughtcrime.securesms.components.settings.app.subscription.RecurringInAppPaymentRepository
 import org.thoughtcrime.securesms.components.settings.configure
-import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.util.BottomSheetUtil
 
 class BecomeASustainerFragment : DSLSettingsBottomSheetFragment() {
 
-  private val viewModel: BecomeASustainerViewModel by viewModels(
-    factoryProducer = {
-      BecomeASustainerViewModel.Factory(RecurringInAppPaymentRepository(AppDependencies.donationsService))
-    }
-  )
+  private val viewModel: BecomeASustainerViewModel by viewModels()
 
   override fun bindAdapter(adapter: DSLSettingsAdapter) {
     BadgePreview.register(adapter)

app/src/main/java/org/thoughtcrime/securesms/badges/self/none/BecomeASustainerViewModel.kt

@@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.badges.self.none
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import io.reactivex.rxjava3.kotlin.subscribeBy
@@ -10,7 +9,7 @@ import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.components.settings.app.subscription.RecurringInAppPaymentRepository
 import org.thoughtcrime.securesms.util.livedata.Store
 
-class BecomeASustainerViewModel(subscriptionsRepository: RecurringInAppPaymentRepository) : ViewModel() {
+class BecomeASustainerViewModel : ViewModel() {
 
   private val store = Store(BecomeASustainerState())
 
@@ -19,7 +18,7 @@ class BecomeASustainerViewModel(subscriptionsRepository: RecurringInAppPaymentRe
   private val disposables = CompositeDisposable()
 
   init {
-    disposables += subscriptionsRepository.getSubscriptions().subscribeBy(
+    disposables += RecurringInAppPaymentRepository.getSubscriptions().subscribeBy(
       onError = { Log.w(TAG, "Could not load subscriptions.") },
       onSuccess = { subscriptions ->
         store.update {
@@ -36,10 +35,4 @@ class BecomeASustainerViewModel(subscriptionsRepository: RecurringInAppPaymentRe
   companion object {
     private val TAG = Log.tag(BecomeASustainerViewModel::class.java)
   }
-
-  class Factory(private val subscriptionsRepository: RecurringInAppPaymentRepository) : ViewModelProvider.Factory {
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-      return modelClass.cast(BecomeASustainerViewModel(subscriptionsRepository))!!
-    }
-  }
 }

app/src/main/java/org/thoughtcrime/securesms/badges/self/overview/BadgesOverviewFragment.kt

@@ -13,9 +13,7 @@ import org.thoughtcrime.securesms.badges.view.ViewBadgeBottomSheetDialogFragment
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
-import org.thoughtcrime.securesms.components.settings.app.subscription.RecurringInAppPaymentRepository
 import org.thoughtcrime.securesms.components.settings.configure
-import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
@@ -31,7 +29,7 @@ class BadgesOverviewFragment : DSLSettingsFragment(
   private val lifecycleDisposable = LifecycleDisposable()
   private val viewModel: BadgesOverviewViewModel by viewModels(
     factoryProducer = {
-      BadgesOverviewViewModel.Factory(BadgeRepository(requireContext()), RecurringInAppPaymentRepository(AppDependencies.donationsService))
+      BadgesOverviewViewModel.Factory(BadgeRepository(requireContext()))
     }
   )
 

app/src/main/java/org/thoughtcrime/securesms/badges/self/overview/BadgesOverviewViewModel.kt

@@ -23,8 +23,7 @@ import java.util.Optional
 private val TAG = Log.tag(BadgesOverviewViewModel::class.java)
 
 class BadgesOverviewViewModel(
-  private val badgeRepository: BadgeRepository,
-  private val subscriptionsRepository: RecurringInAppPaymentRepository
+  private val badgeRepository: BadgeRepository
 ) : ViewModel() {
   private val store = Store(BadgesOverviewState())
   private val eventSubject = PublishSubject.create<BadgesOverviewEvent>()
@@ -51,8 +50,8 @@ class BadgesOverviewViewModel(
       }
 
     disposables += Single.zip(
-      subscriptionsRepository.getActiveSubscription(InAppPaymentSubscriberRecord.Type.DONATION),
-      subscriptionsRepository.getSubscriptions()
+      RecurringInAppPaymentRepository.getActiveSubscription(InAppPaymentSubscriberRecord.Type.DONATION),
+      RecurringInAppPaymentRepository.getSubscriptions()
     ) { active, all ->
       if (!active.isActive && active.activeSubscription?.willCancelAtPeriodEnd() == true) {
         Optional.ofNullable<String>(all.firstOrNull { it.level == active.activeSubscription?.level }?.badge?.id)
@@ -89,11 +88,10 @@ class BadgesOverviewViewModel(
   }
 
   class Factory(
-    private val badgeRepository: BadgeRepository,
-    private val subscriptionsRepository: RecurringInAppPaymentRepository
+    private val badgeRepository: BadgeRepository
   ) : ViewModelProvider.Factory {
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
-      return requireNotNull(modelClass.cast(BadgesOverviewViewModel(badgeRepository, subscriptionsRepository)))
+      return requireNotNull(modelClass.cast(BadgesOverviewViewModel(badgeRepository)))
     }
   }