Merge branch 'dev' into feature/update-crowdin-translations

Author: ThomasSession

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/messaging/jobs/MessageSendJob.kt

@@ -89,16 +89,16 @@ class MessageSendJob @AssistedInject constructor(
         val isSync = destination is Destination.Contact && destination.publicKey == storage.getUserPublicKey()
 
         try {
-            withTimeout(20_000L) {
-                // Shouldn't send message to group when the group has no keys available
-                if (destination is Destination.ClosedGroup) {
+            // Shouldn't send message to group when the group has no keys available
+            if (destination is Destination.ClosedGroup) {
+                withTimeout(20_000L) {
                     configFactory
                         .waitForGroupEncryptionKeys(AccountId(destination.publicKey))
                 }
-
-                MessageSender.sendNonDurably(this@MessageSendJob.message, destination, isSync)
             }
 
+            MessageSender.sendNonDurably(this@MessageSendJob.message, destination, isSync)
+
             this.handleSuccess(dispatcherName)
             statusCallback?.trySend(Result.success(Unit))
         } catch (e: HTTP.HTTPRequestFailedException) {

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/session/libsignal/streams/ProfileCipherOutputStream.java

@@ -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/session/libsignal/streams/ProfileCipherOutputStreamFactory.java

@@ -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 {