Feature/more pro states

app/build.gradle.kts

@@ -181,13 +181,12 @@ android {
             matchingFallbacks += "release"
 
             signingConfig = signingConfigs.getByName("debug")
-            applicationIdSuffix = ".$name"
 
             devNetDefaultOn(false)
             enablePermissiveNetworkSecurityConfig(true)
 
             setAlternativeAppName("Session QA")
-            setAuthorityPostfix(".qa")
+            setAuthorityPostfix("")
         }
 
         create("automaticQa") {

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

@@ -222,6 +222,8 @@ interface TextSecurePreferences {
     fun setDebugProPlanStatus(status: DebugMenuViewModel.DebugProPlanStatus?)
     fun getDebugForceNoBilling(): Boolean
     fun setDebugForceNoBilling(hasBilling: Boolean)
+    fun getDebugIsWithinQuickRefund(): Boolean
+    fun setDebugIsWithinQuickRefund(isWithin: Boolean)
 
     fun setSubscriptionProvider(provider: String)
     fun getSubscriptionProvider(): String?
@@ -388,6 +390,7 @@ interface TextSecurePreferences {
         const val DEBUG_SUBSCRIPTION_STATUS = "debug_subscription_status"
         const val DEBUG_PRO_PLAN_STATUS = "debug_pro_plan_status"
         const val DEBUG_FORCE_NO_BILLING = "debug_pro_has_billing"
+        const val DEBUG_WITHIN_QUICK_REFUND = "debug_within_quick_refund"
 
         const val SUBSCRIPTION_PROVIDER = "session_subscription_provider"
         const val DEBUG_AVATAR_REUPLOAD = "debug_avatar_reupload"
@@ -1799,6 +1802,15 @@ class AppTextSecurePreferences @Inject constructor(
         _events.tryEmit(TextSecurePreferences.DEBUG_FORCE_NO_BILLING)
     }
 
+    override fun getDebugIsWithinQuickRefund(): Boolean {
+        return getBooleanPreference(TextSecurePreferences.DEBUG_WITHIN_QUICK_REFUND, false)
+    }
+
+    override fun setDebugIsWithinQuickRefund(isWithin: Boolean) {
+        setBooleanPreference(TextSecurePreferences.DEBUG_WITHIN_QUICK_REFUND, isWithin)
+        _events.tryEmit(TextSecurePreferences.DEBUG_FORCE_NO_BILLING)
+    }
+
     override fun getSubscriptionProvider(): String? {
         return getStringPreference(TextSecurePreferences.SUBSCRIPTION_PROVIDER, null)
     }

app/src/main/java/org/thoughtcrime/securesms/InputBarDialogs.kt

@@ -63,8 +63,9 @@ fun InputBarDialogs(
         }
 
         // Pro CTA
-        if (inputBarDialogsState.sessionProCharLimitCTA) {
+        if (inputBarDialogsState.sessionProCharLimitCTA != null) {
             LongMessageProCTA(
+                proSubscription = inputBarDialogsState.sessionProCharLimitCTA.proSubscription,
                 onDismissRequest = {sendCommand(InputbarViewModel.Commands.HideSessionProCTA)}
             )
         }

app/src/main/java/org/thoughtcrime/securesms/InputbarViewModel.kt

@@ -12,6 +12,7 @@ import org.session.libsession.utilities.recipients.isPro
 import org.session.libsession.utilities.recipients.shouldShowProBadge
 import org.thoughtcrime.securesms.database.RecipientRepository
 import org.thoughtcrime.securesms.pro.ProStatusManager
+import org.thoughtcrime.securesms.pro.SubscriptionType
 import org.thoughtcrime.securesms.ui.SimpleDialogData
 import org.thoughtcrime.securesms.util.NumberUtil
 
@@ -94,7 +95,7 @@ abstract class InputbarViewModel(
 
     fun showSessionProCTA(){
         _inputBarStateDialogsState.update {
-            it.copy(sessionProCharLimitCTA = true)
+            it.copy(sessionProCharLimitCTA = CharLimitCTAData(proStatusManager.subscriptionState.value.type))
         }
     }
 
@@ -165,7 +166,7 @@ abstract class InputbarViewModel(
 
             is Commands.HideSessionProCTA -> {
                 _inputBarStateDialogsState.update {
-                    it.copy(sessionProCharLimitCTA = false)
+                    it.copy(sessionProCharLimitCTA = null)
                 }
             }
         }
@@ -195,7 +196,11 @@ abstract class InputbarViewModel(
 
     data class InputBarDialogsState(
         val showSimpleDialog: SimpleDialogData? = null,
-        val sessionProCharLimitCTA: Boolean = false
+        val sessionProCharLimitCTA: CharLimitCTAData? = null
+    )
+
+    data class CharLimitCTAData(
+        val proSubscription: SubscriptionType
     )
 
     sealed interface Commands {

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt

@@ -706,13 +706,22 @@ fun MessageDetailDialogs(
     if(state.proBadgeCTA != null){
         when(state.proBadgeCTA){
             is ProBadgeCTA.Generic ->
-                GenericProCTA(onDismissRequest = {sendCommand(Commands.HideProBadgeCTA)})
+                GenericProCTA(
+                    proSubscription = state.proBadgeCTA.proSubscription,
+                    onDismissRequest = {sendCommand(Commands.HideProBadgeCTA)}
+                )
 
             is ProBadgeCTA.LongMessage ->
-                LongMessageProCTA(onDismissRequest = {sendCommand(Commands.HideProBadgeCTA)})
+                LongMessageProCTA(
+                    proSubscription = state.proBadgeCTA.proSubscription,
+                    onDismissRequest = {sendCommand(Commands.HideProBadgeCTA)}
+                )
 
             is ProBadgeCTA.AnimatedProfile ->
-                AnimatedProfilePicProCTA(onDismissRequest = {sendCommand(Commands.HideProBadgeCTA)})
+                AnimatedProfilePicProCTA(
+                    proSubscription = state.proBadgeCTA.proSubscription,
+                    onDismissRequest = {sendCommand(Commands.HideProBadgeCTA)}
+                )
         }
     }
 

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailsViewModel.kt

@@ -51,6 +51,7 @@ import org.thoughtcrime.securesms.mms.Slide
 import org.thoughtcrime.securesms.pro.ProStatusManager
 import org.thoughtcrime.securesms.pro.ProStatusManager.MessageProFeature.AnimatedAvatar
 import org.thoughtcrime.securesms.pro.ProStatusManager.MessageProFeature.LongMessage
+import org.thoughtcrime.securesms.pro.SubscriptionType
 import org.thoughtcrime.securesms.ui.GetString
 import org.thoughtcrime.securesms.ui.TitledText
 import org.thoughtcrime.securesms.util.AvatarUIData
@@ -283,13 +284,14 @@ class MessageDetailsViewModel @AssistedInject constructor(
             is Commands.ShowProBadgeCTA -> {
                 val features = state.value.proFeatures
                 _dialogState.update {
+                    val proSubscription = proStatusManager.subscriptionState.value.type
                     it.copy(
                         proBadgeCTA = when{
-                            features.size > 1 -> ProBadgeCTA.Generic // always show the generic cta when there are more than 1 feature
+                            features.size > 1 -> ProBadgeCTA.Generic(proSubscription) // always show the generic cta when there are more than 1 feature
 
-                            features.contains(LongMessage) -> ProBadgeCTA.LongMessage
-                            features.contains(AnimatedAvatar) -> ProBadgeCTA.AnimatedProfile
-                            else -> ProBadgeCTA.Generic
+                            features.contains(LongMessage) -> ProBadgeCTA.LongMessage(proSubscription)
+                            features.contains(AnimatedAvatar) -> ProBadgeCTA.AnimatedProfile(proSubscription)
+                            else -> ProBadgeCTA.Generic(proSubscription)
                         }
                     )
                 }
@@ -369,10 +371,10 @@ data class MessageDetailsState(
     val canDelete: Boolean get() = !readOnly
 }
 
-sealed interface ProBadgeCTA {
-    data object Generic: ProBadgeCTA
-    data object LongMessage: ProBadgeCTA
-    data object AnimatedProfile: ProBadgeCTA
+sealed class ProBadgeCTA(open val proSubscription: SubscriptionType) {
+    data class Generic(override val proSubscription: SubscriptionType): ProBadgeCTA(proSubscription)
+    data class LongMessage(override val proSubscription: SubscriptionType): ProBadgeCTA(proSubscription)
+    data class AnimatedProfile(override val proSubscription: SubscriptionType): ProBadgeCTA(proSubscription)
 }
 
 data class DialogsState(

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/settings/ConversationSettingsDialogs.kt

@@ -36,6 +36,7 @@ import org.thoughtcrime.securesms.conversation.v2.settings.ConversationSettingsV
 import org.thoughtcrime.securesms.conversation.v2.settings.ConversationSettingsViewModel.Commands.UpdateGroupDescription
 import org.thoughtcrime.securesms.conversation.v2.settings.ConversationSettingsViewModel.Commands.UpdateGroupName
 import org.thoughtcrime.securesms.conversation.v2.settings.ConversationSettingsViewModel.Commands.UpdateNickname
+import org.thoughtcrime.securesms.pro.SubscriptionType
 import org.thoughtcrime.securesms.ui.AlertDialog
 import org.thoughtcrime.securesms.ui.CTAImage
 import org.thoughtcrime.securesms.ui.DialogButtonData
@@ -232,6 +233,7 @@ fun ConversationSettingsDialogs(
     // pin CTA
     if(dialogsState.pinCTA != null){
         PinProCTA(
+            proSubscription = dialogsState.pinCTA.proSubscription,
             overTheLimit = dialogsState.pinCTA.overTheLimit,
             onDismissRequest = {
                 sendCommand(HidePinCTADialog)
@@ -242,6 +244,7 @@ fun ConversationSettingsDialogs(
     when(dialogsState.proBadgeCTA){
         is ConversationSettingsViewModel.ProBadgeCTA.Generic -> {
             GenericProCTA(
+                proSubscription = dialogsState.proBadgeCTA.proSubscription,
                 onDismissRequest = {
                     sendCommand(HideProBadgeCTA)
                 }
@@ -438,7 +441,7 @@ fun PreviewCTAGroupDialog() {
     PreviewTheme {
         ConversationSettingsDialogs(
             dialogsState = ConversationSettingsViewModel.DialogsState(
-                proBadgeCTA = ConversationSettingsViewModel.ProBadgeCTA.Group
+                proBadgeCTA = ConversationSettingsViewModel.ProBadgeCTA.Group(SubscriptionType.NeverSubscribed)
             ),
             sendCommand = {}
         )

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/settings/ConversationSettingsViewModel.kt

@@ -60,6 +60,7 @@ import org.thoughtcrime.securesms.dependencies.ConfigFactory.Companion.MAX_NAME_
 import org.thoughtcrime.securesms.groups.OpenGroupManager
 import org.thoughtcrime.securesms.home.HomeActivity
 import org.thoughtcrime.securesms.pro.ProStatusManager
+import org.thoughtcrime.securesms.pro.SubscriptionType
 import org.thoughtcrime.securesms.repository.ConversationRepository
 import org.thoughtcrime.securesms.ui.SimpleDialogData
 import org.thoughtcrime.securesms.ui.UINavigator
@@ -719,7 +720,10 @@ class ConversationSettingsViewModel @AssistedInject constructor(
         if(totalPins >= maxPins){
             // the user has reached the pin limit, show the CTA
             _dialogState.update {
-                it.copy(pinCTA = PinProCTA(overTheLimit = totalPins > maxPins))
+                it.copy(pinCTA = PinProCTA(
+                    overTheLimit = totalPins > maxPins,
+                    proSubscription = proStatusManager.subscriptionState.value.type
+                ))
             }
         } else {
             viewModelScope.launch {
@@ -1236,8 +1240,8 @@ class ConversationSettingsViewModel @AssistedInject constructor(
             is Commands.ShowProBadgeCTA -> {
                 _dialogState.update {
                     it.copy(
-                        proBadgeCTA = if(recipient?.isGroupV2Recipient == true) ProBadgeCTA.Group
-                        else ProBadgeCTA.Generic
+                        proBadgeCTA = if(recipient?.isGroupV2Recipient == true) ProBadgeCTA.Group(proStatusManager.subscriptionState.value.type)
+                        else ProBadgeCTA.Generic(proStatusManager.subscriptionState.value.type)
                     )
                 }
             }
@@ -1441,12 +1445,13 @@ class ConversationSettingsViewModel @AssistedInject constructor(
     )
 
     data class PinProCTA(
-        val overTheLimit: Boolean
+        val overTheLimit: Boolean,
+        val proSubscription: SubscriptionType
     )
 
-    sealed interface ProBadgeCTA {
-        data object Generic: ProBadgeCTA
-        data object Group: ProBadgeCTA
+    sealed class ProBadgeCTA(open val proSubscription: SubscriptionType) {
+        data class Generic(override val proSubscription: SubscriptionType): ProBadgeCTA(proSubscription)
+        data class Group(override val proSubscription: SubscriptionType): ProBadgeCTA(proSubscription)
     }
 
     data class NicknameDialogData(

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

@@ -278,6 +278,15 @@ fun DebugMenu(
                                 )
                             }
                         )
+
+                        Spacer(modifier = Modifier.height(LocalDimensions.current.xsSpacing))
+                        DebugSwitchRow(
+                            text = "Is Within Quick Refund Window",
+                            checked = uiState.withinQuickRefund,
+                            onCheckedChange = {
+                                sendCommand(DebugMenuViewModel.Commands.WithinQuickRefund(it))
+                            }
+                        )
                     }
                 }
 
@@ -831,6 +840,7 @@ fun PreviewDebugMenu() {
                 selectedDebugProPlanStatus = DebugMenuViewModel.DebugProPlanStatus.NORMAL,
                 debugProPlans = emptyList(),
                 forceNoBilling = false,
+                withinQuickRefund = true,
                 forceDeterministicEncryption = false,
                 debugAvatarReupload = true,
             ),

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

@@ -110,6 +110,7 @@ class DebugMenuViewModel @Inject constructor(
                 .flatMap { it.availablePlans.asSequence().map { plan -> DebugProPlan(it, plan) } }
                 .toList(),
             forceNoBilling = textSecurePreferences.getDebugForceNoBilling(),
+            withinQuickRefund = textSecurePreferences.getDebugIsWithinQuickRefund(),
             availableAltFileServers = TEST_FILE_SERVERS,
             alternativeFileServer = textSecurePreferences.alternativeFileServer,
         )
@@ -285,6 +286,13 @@ class DebugMenuViewModel @Inject constructor(
                 }
             }
 
+            is Commands.WithinQuickRefund -> {
+                textSecurePreferences.setDebugIsWithinQuickRefund(command.set)
+                _uiState.update {
+                    it.copy(withinQuickRefund = command.set)
+                }
+            }
+
             is Commands.ForcePostPro -> {
                 textSecurePreferences.setForcePostPro(command.set)
                 _uiState.update {
@@ -333,7 +341,9 @@ class DebugMenuViewModel @Inject constructor(
             }
 
             is Commands.PurchaseDebugPlan -> {
-                command.plan.apply { manager.purchasePlan(plan) }
+                viewModelScope.launch {
+                    command.plan.apply { manager.purchasePlan(plan) }
+                }
             }
 
             is Commands.ToggleDeterministicEncryption -> {
@@ -469,6 +479,7 @@ class DebugMenuViewModel @Inject constructor(
         val selectedDebugProPlanStatus: DebugProPlanStatus,
         val debugProPlans: List<DebugProPlan>,
         val forceNoBilling: Boolean,
+        val withinQuickRefund: Boolean,
         val alternativeFileServer: FileServer? = null,
         val availableAltFileServers: List<FileServer> = emptyList(),
     )
@@ -509,6 +520,7 @@ class DebugMenuViewModel @Inject constructor(
         data class ForceOtherUsersAsPro(val set: Boolean) : Commands()
         data class ForceIncomingMessagesAsPro(val set: Boolean) : Commands()
         data class ForceNoBilling(val set: Boolean) : Commands()
+        data class WithinQuickRefund(val set: Boolean) : Commands()
         data class ForcePostPro(val set: Boolean) : Commands()
         data class ForceShortTTl(val set: Boolean) : Commands()
         data class SetMessageProFeature(val feature: ProStatusManager.MessageProFeature, val set: Boolean) : Commands()

app/src/main/java/org/thoughtcrime/securesms/home/HomeDialogs.kt

@@ -1,38 +1,29 @@
 package org.thoughtcrime.securesms.home
 
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.sp
 import com.squareup.phrase.Phrase
 import kotlinx.coroutines.delay
 import network.loki.messenger.R
 import org.session.libsession.utilities.NonTranslatableStringConstants
-import org.session.libsession.utilities.NonTranslatableStringConstants.PRO
-import org.session.libsession.utilities.StringSubstitutionConstants.APP_NAME_KEY
 import org.session.libsession.utilities.StringSubstitutionConstants.APP_PRO_KEY
 import org.session.libsession.utilities.StringSubstitutionConstants.PRO_KEY
 import org.session.libsession.utilities.StringSubstitutionConstants.TIME_KEY
 import org.thoughtcrime.securesms.home.HomeViewModel.Commands.HandleUserProfileCommand
 import org.thoughtcrime.securesms.home.HomeViewModel.Commands.HidePinCTADialog
 import org.thoughtcrime.securesms.home.HomeViewModel.Commands.HideUserProfileModal
-import org.thoughtcrime.securesms.home.startconversation.StartConversationDestination
 import org.thoughtcrime.securesms.home.startconversation.StartConversationSheet
 import org.thoughtcrime.securesms.preferences.prosettings.ProSettingsDestination
 import org.thoughtcrime.securesms.ui.AnimatedSessionProCTA
 import org.thoughtcrime.securesms.ui.CTAFeature
 import org.thoughtcrime.securesms.ui.PinProCTA
-import org.thoughtcrime.securesms.ui.UINavigator
 import org.thoughtcrime.securesms.ui.UserProfileModal
-import org.thoughtcrime.securesms.ui.theme.PreviewTheme
 import org.thoughtcrime.securesms.ui.theme.SessionMaterialTheme
 
 @Composable
@@ -45,6 +36,7 @@ fun HomeDialogs(
         if(dialogsState.pinCTA != null){
             PinProCTA(
                 overTheLimit = dialogsState.pinCTA.overTheLimit,
+                proSubscription = dialogsState.pinCTA.proSubscription,
                 onDismissRequest = {
                     sendCommand(HidePinCTADialog)
                 }
@@ -105,7 +97,7 @@ fun HomeDialogs(
                 negativeButtonText = stringResource(R.string.close),
                 onUpgrade = {
                     sendCommand(HomeViewModel.Commands.HideExpiringCTADialog)
-                    sendCommand(HomeViewModel.Commands.GotoProSettings(ProSettingsDestination.UpdatePlan))
+                    sendCommand(HomeViewModel.Commands.GotoProSettings(ProSettingsDestination.ChoosePlan))
                 },
                 onCancel = {
                     sendCommand(HomeViewModel.Commands.HideExpiringCTADialog)
@@ -146,7 +138,7 @@ fun HomeDialogs(
                 negativeButtonText = stringResource(R.string.cancel),
                 onUpgrade = {
                     sendCommand(HomeViewModel.Commands.HideExpiredCTADialog)
-                    sendCommand(HomeViewModel.Commands.GotoProSettings(ProSettingsDestination.GetOrRenewPlan))
+                    sendCommand(HomeViewModel.Commands.GotoProSettings(ProSettingsDestination.ChoosePlan))
                 },
                 onCancel = {
                     sendCommand(HomeViewModel.Commands.HideExpiredCTADialog)