New debug drop down to force the pro status (normal, always loading, always erroring)

Author: ThomasSession

app/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt

@@ -216,6 +216,8 @@ interface TextSecurePreferences {
 
     fun getDebugSubscriptionType(): DebugMenuViewModel.DebugSubscriptionStatus?
     fun setDebugSubscriptionType(status: DebugMenuViewModel.DebugSubscriptionStatus?)
+    fun getDebugProPlanStatus(): DebugMenuViewModel.DebugProPlanStatus?
+    fun setDebugProPlanStatus(status: DebugMenuViewModel.DebugProPlanStatus?)
 
     fun setSubscriptionProvider(provider: String)
     fun getSubscriptionProvider(): String?
@@ -377,6 +379,7 @@ interface TextSecurePreferences {
 
         const val DEBUG_MESSAGE_FEATURES = "debug_message_features"
         const val DEBUG_SUBSCRIPTION_STATUS = "debug_subscription_status"
+        const val DEBUG_PRO_PLAN_STATUS = "debug_pro_plan_status"
 
         const val SUBSCRIPTION_PROVIDER = "session_subscription_provider"
 
@@ -1766,6 +1769,17 @@ class AppTextSecurePreferences @Inject constructor(
         _events.tryEmit(TextSecurePreferences.DEBUG_SUBSCRIPTION_STATUS)
     }
 
+    override fun getDebugProPlanStatus(): DebugMenuViewModel.DebugProPlanStatus? {
+        return getStringPreference(TextSecurePreferences.DEBUG_PRO_PLAN_STATUS, null)?.let {
+            DebugMenuViewModel.DebugProPlanStatus.valueOf(it)
+        }
+    }
+
+    override fun setDebugProPlanStatus(status: DebugMenuViewModel.DebugProPlanStatus?) {
+        setStringPreference(TextSecurePreferences.DEBUG_PRO_PLAN_STATUS, status?.name)
+        _events.tryEmit(TextSecurePreferences.DEBUG_PRO_PLAN_STATUS)
+    }
+
     override fun getSubscriptionProvider(): String? {
         return getStringPreference(TextSecurePreferences.SUBSCRIPTION_PROVIDER, null)
     }

app/src/main/java/org/thoughtcrime/securesms/debugmenu/DebugMenu.kt

@@ -277,6 +277,26 @@ fun DebugMenu(
                                 )
                             }
                         )
+
+                        Spacer(modifier = Modifier.height(LocalDimensions.current.xsSpacing))
+                        Text(
+                            modifier = Modifier.padding(top = LocalDimensions.current.xxsSpacing),
+                            text = "Pro Data Status",
+                            style = LocalType.current.base
+                        )
+                        DropDown(
+                            modifier = Modifier.fillMaxWidth()
+                                .padding(top = LocalDimensions.current.xxsSpacing),
+                            selectedText = uiState.selectedDebugProPlanStatus.label,
+                            values = uiState.debugProPlanStatus.map { it.label },
+                            onValueSelected = { selection ->
+                                sendCommand(
+                                    DebugMenuViewModel.Commands.SetDebugProPlanStatus(
+                                        uiState.debugProPlanStatus.first { it.label == selection }
+                                    )
+                                )
+                            }
+                        )
                     }
                 }
 
@@ -750,6 +770,8 @@ fun PreviewDebugMenu() {
                 dbInspectorState = DebugMenuViewModel.DatabaseInspectorState.STARTED,
                 debugSubscriptionStatuses = setOf(DebugMenuViewModel.DebugSubscriptionStatus.AUTO_GOOGLE),
                 selectedDebugSubscriptionStatus = DebugMenuViewModel.DebugSubscriptionStatus.AUTO_GOOGLE,
+                debugProPlanStatus = setOf(DebugMenuViewModel.DebugProPlanStatus.NORMAL),
+                selectedDebugProPlanStatus = DebugMenuViewModel.DebugProPlanStatus.NORMAL,
                 debugProPlans = emptyList(),
             ),
             sendCommand = {},

app/src/main/java/org/thoughtcrime/securesms/debugmenu/DebugMenuViewModel.kt

@@ -93,6 +93,12 @@ class DebugMenuViewModel @Inject constructor(
                 DebugSubscriptionStatus.EXPIRED_APPLE,
             ),
             selectedDebugSubscriptionStatus = textSecurePreferences.getDebugSubscriptionType() ?: DebugSubscriptionStatus.AUTO_GOOGLE,
+            debugProPlanStatus = setOf(
+                DebugProPlanStatus.NORMAL,
+                DebugProPlanStatus.LOADING,
+                DebugProPlanStatus.ERROR,
+            ),
+            selectedDebugProPlanStatus = textSecurePreferences.getDebugProPlanStatus() ?: DebugProPlanStatus.NORMAL,
             debugProPlans = subscriptionManagers.asSequence()
                 .flatMap { it.availablePlans.asSequence().map { plan -> DebugProPlan(it, plan) } }
                 .toList(),
@@ -302,6 +308,13 @@ class DebugMenuViewModel @Inject constructor(
                 }
             }
 
+            is Commands.SetDebugProPlanStatus -> {
+                textSecurePreferences.setDebugProPlanStatus(command.status)
+                _uiState.update {
+                    it.copy(selectedDebugProPlanStatus = command.status)
+                }
+            }
+
             is Commands.PurchaseDebugPlan -> {
                 command.plan.apply { manager.purchasePlan(plan) }
             }
@@ -410,6 +423,8 @@ class DebugMenuViewModel @Inject constructor(
         val dbInspectorState: DatabaseInspectorState,
         val debugSubscriptionStatuses: Set<DebugSubscriptionStatus>,
         val selectedDebugSubscriptionStatus: DebugSubscriptionStatus,
+        val debugProPlanStatus: Set<DebugProPlanStatus>,
+        val selectedDebugProPlanStatus: DebugProPlanStatus,
         val debugProPlans: List<DebugProPlan>,
     )
 
@@ -428,6 +443,12 @@ class DebugMenuViewModel @Inject constructor(
         EXPIRED_APPLE("Expired (Apple)"),
     }
 
+    enum class DebugProPlanStatus(val label: String){
+        NORMAL("Normal State"),
+        LOADING("Always Loading"),
+        ERROR("Always Erroring out"),
+    }
+
     sealed class Commands {
         object ChangeEnvironment : Commands()
         data class ShowEnvironmentWarningDialog(val environment: String) : Commands()
@@ -452,6 +473,7 @@ class DebugMenuViewModel @Inject constructor(
         data class GenerateContacts(val prefix: String, val count: Int): Commands()
         data object ToggleDatabaseInspector : Commands()
         data class SetDebugSubscriptionStatus(val status: DebugSubscriptionStatus) : Commands()
+        data class SetDebugProPlanStatus(val status: DebugProPlanStatus) : Commands()
         data class PurchaseDebugPlan(val plan: DebugProPlan) : Commands()
     }
 }

app/src/main/java/org/thoughtcrime/securesms/pro/ProStatusManager.kt

@@ -42,11 +42,20 @@ class ProStatusManager @Inject constructor(
         recipientRepository.observeSelf(),
         (TextSecurePreferences.events.filter { it == TextSecurePreferences.DEBUG_SUBSCRIPTION_STATUS } as Flow<*>)
             .onStart { emit(Unit) }
-            .map { prefs.getDebugSubscriptionType() }
-    ){ selfRecipient, debugSubscription ->
+            .map { prefs.getDebugSubscriptionType() },
+        (TextSecurePreferences.events.filter { it == TextSecurePreferences.DEBUG_PRO_PLAN_STATUS } as Flow<*>)
+            .onStart { emit(Unit) }
+            .map { prefs.getDebugProPlanStatus() },
+    ){ selfRecipient, debugSubscription, debugProPlanStatus ->
         //todo PRO implement properly
 
         val subscriptionState = debugSubscription ?: DebugMenuViewModel.DebugSubscriptionStatus.AUTO_GOOGLE
+        val proStatus = when(debugProPlanStatus){
+            DebugMenuViewModel.DebugProPlanStatus.LOADING -> State.Loading
+            DebugMenuViewModel.DebugProPlanStatus.ERROR -> State.Error(Exception())
+            else -> State.Success(Unit)
+        }
+
         SubscriptionState(
             type = when(subscriptionState){
                 DebugMenuViewModel.DebugSubscriptionStatus.AUTO_GOOGLE -> SubscriptionType.Active.AutoRenewing(
@@ -136,8 +145,8 @@ class ProStatusManager @Inject constructor(
                     )
                 )
             },
-               // SubscriptionType.NeverSubscribed,
-            refreshState = State.Success(Unit),
+
+            refreshState = proStatus,
         )
 
     }.stateIn(GlobalScope, SharingStarted.Eagerly,