Merge pull request #2122 from session-foundation/release/1.33.4

1.33.4 in master

Author: ThomasSession

app/build.gradle.kts

@@ -26,8 +26,8 @@ configurations.configureEach {
     exclude(module = "commons-logging")
 }
 
-val canonicalVersionCode = 449
-val canonicalVersionName = "1.33.3"
+val canonicalVersionCode = 451
+val canonicalVersionName = "1.33.4"
 
 val postFixSize = 10
 val abiPostFix = mapOf(

app/src/main/java/org/session/libsession/network/onion/PathManager.kt

@@ -1,6 +1,7 @@
 package org.session.libsession.network.onion
 
 import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.FlowPreview
@@ -93,7 +94,7 @@ open class PathManager @Inject constructor(
 
     // Warm up from persisted paths without blocking construction.
     // Stored as a Deferred so getPath() can await it for deterministic completion.
-    private val warmUpJob: Deferred<Unit> = scope.async {
+    private val warmUpJob: Deferred<Unit> = scope.async(start = CoroutineStart.LAZY) {
         val persisted = sanitizePaths(storage.getOnionRequestPaths())
         _paths.update { current -> if (current.isEmpty()) persisted else current }
     }

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

@@ -18,5 +18,6 @@ object NonTranslatableStringConstants {
     const val ENTITY_RANGEPROOF          = "Rangeproof PTY LTD"
     const val ENTITY_STF                 = "The Session Technology Foundation"
     const val DONATE_APPEAL_NAME         = "Cofounder of Session Chris McCabe"
+    const val ENTITY_STF_SHORT           = "Session Technology Foundation (STF)"
 }
 

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

@@ -65,5 +65,6 @@ object StringSubstitutionConstants {
     const val ACTION_TYPE_KEY: StringSubKey                = "action_type"
     const val ACTIVATION_TYPE_KEY: StringSubKey            = "activation_type"
     const val ENTITY_KEY: StringSubKey                     = "entity"
-    const val DONATE_APPEAL_KEY: StringSubKey                     = "donate_appeal_name"
+    const val DONATE_APPEAL_KEY: StringSubKey              = "donate_appeal_name"
+    const val ENTITY_STF_SHORT_KEY: StringSubKey           = "entity_stf_short"
 }

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

@@ -364,11 +364,11 @@ interface TextSecurePreferences {
 
 
         // Donation
-        const val HAS_DONATED = "has_donated_v2"
-        const val HAS_COPIED_DONATION_URL = "has_copied_donation_url_v2"
-        const val SEEN_DONATION_CTA_AMOUNT = "seen_donation_cta_amount_v2"
-        const val LAST_SEEN_DONATION_CTA = "last_seen_donation_cta_v2"
-        const val SHOW_DONATION_CTA_FROM_POSITIVE_REVIEW = "show_donation_cta_from_positive_review_v2"
+        const val HAS_DONATED = "has_donated_v3"
+        const val HAS_COPIED_DONATION_URL = "has_copied_donation_url_v3"
+        const val SEEN_DONATION_CTA_AMOUNT = "seen_donation_cta_amount_v3"
+        const val LAST_SEEN_DONATION_CTA = "last_seen_donation_cta_v3"
+        const val SHOW_DONATION_CTA_FROM_POSITIVE_REVIEW = "show_donation_cta_from_positive_review_v3"
 
         const val DEBUG_HAS_DONATED = "debug_has_donated"
         const val DEBUG_HAS_COPIED_DONATION_URL = "debug_has_copied_donation_url"

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

@@ -33,6 +33,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import com.squareup.phrase.Phrase
 import kotlinx.coroutines.delay
@@ -75,7 +76,9 @@ import org.thoughtcrime.securesms.ui.theme.LocalColors
 import org.thoughtcrime.securesms.ui.theme.LocalDimensions
 import org.thoughtcrime.securesms.ui.theme.LocalType
 import org.thoughtcrime.securesms.ui.theme.PreviewTheme
+import org.thoughtcrime.securesms.ui.theme.SessionColorsParameterProvider
 import org.thoughtcrime.securesms.ui.theme.SessionMaterialTheme
+import org.thoughtcrime.securesms.ui.theme.ThemeColors
 import org.thoughtcrime.securesms.ui.theme.blackAlpha40
 import org.thoughtcrime.securesms.util.DonationManager.Companion.URL_DONATE
 
@@ -273,11 +276,12 @@ fun DonationDialog(
         sendCommand(HideDonationCTADialog)
     }
 
-    val title = Phrase.from(context,R.string.donateSessionAppealTitle)
-        .put(StringSubstitutionConstants.DONATE_APPEAL_KEY, NonTranslatableStringConstants.DONATE_APPEAL_NAME)
+    val title = Phrase.from(context,R.string.finalAppeal)
+        .put(StringSubstitutionConstants.APP_NAME_KEY, NonTranslatableStringConstants.APP_NAME)
         .format()
 
-    val text = Phrase.from(context,R.string.donateSessionAppealDescription)
+    val text = Phrase.from(context,R.string.finalAppealDescription)
+        .put(StringSubstitutionConstants.ENTITY_STF_SHORT_KEY, NonTranslatableStringConstants.ENTITY_STF_SHORT)
         .put(StringSubstitutionConstants.APP_NAME_KEY, NonTranslatableStringConstants.APP_NAME)
         .format()
 
@@ -294,13 +298,17 @@ fun DonationDialog(
                             .verticalScroll(rememberScrollState())
                     ) {
                         // hero image
-                        BottomFadingEdgeBox(
+                        /*BottomFadingEdgeBox(
                             modifier = Modifier.heightIn(max = heroMaxHeight),
                             fadingEdgeHeight = 70.dp,
                             fadingColor = LocalColors.current.backgroundSecondary,
                             content = { _ ->
                                 CTAImage(heroImage = R.drawable.cta_hero_donation)
                             },
+                        )*/
+                        CTAImage(
+                            modifier = Modifier.background(LocalColors.current.backgroundSecondary),
+                            heroImage = R.drawable.cta_hero_donation
                         )
 
                         // content
@@ -348,7 +356,7 @@ fun DonationDialog(
                                     modifier = Modifier
                                         .qaTag(R.string.qa_cta_button_positive)
                                         .shimmerOverlay(),
-                                    text = stringResource(R.string.donateSessionAppealReadMore),
+                                    text = stringResource(R.string.readMoreCapital),
                                     onClick =  {
                                         context.openUrl(URL_DONATE)
                                         sendCommand(HomeViewModel.Commands.OnDonationLinkClicked)
@@ -383,8 +391,10 @@ fun DonationDialog(
 
 @Preview
 @Composable
-fun PreviewDonationDialog() {
-    PreviewTheme {
+fun PreviewDonationDialog(
+    @PreviewParameter(SessionColorsParameterProvider::class) colors: ThemeColors
+) {
+    PreviewTheme(colors) {
         Column(
             modifier = Modifier.fillMaxSize()
         ) {

app/src/main/java/org/thoughtcrime/securesms/ui/ProComponents.kt

@@ -474,10 +474,11 @@ fun SimpleSessionProCTA(
 
 @Composable
 fun CTAImage(
+    modifier: Modifier = Modifier,
     @DrawableRes heroImage: Int,
 ){
     AsyncImage(
-        modifier = Modifier
+        modifier = modifier
             .fillMaxWidth()
             .background(LocalColors.current.accent),
         contentScale = ContentScale.FillWidth,

app/src/main/res/drawable-nodpi/cta_hero_donation.webp

@@ -552,6 +552,8 @@
     <string name="feedbackDescription">Podělte se o své zkušenosti s {app_name} vyplněním krátkého dotazníku.</string>
     <string name="file">Soubor</string>
     <string name="files">Soubory</string>
+    <string name="finalAppeal"><font color="0">Naše poslední výzva:</font>\n{app_name} bude za 90 dní ukončena</string>
+    <string name="finalAppealDescription">Vaše dary pomohly, ale {entity_stf_short} získala pouze tolik prostředků, aby podpořila kritické operace do 8. července.\n\nVývoj byl pozastaven a bez dodatečného financování bude STF ukončena, což povede k odstranění aplikace {app_name} z obchodů s aplikacemi a k vypnutí základních služeb.\n\nPomozte nám prosím zajistit budoucnost Session.</string>
     <string name="followSystemSettings">Použít nastavení systému.</string>
     <string name="forever">Navždy</string>
     <string name="from">Od:</string>
@@ -1254,6 +1256,7 @@
     <string name="rateSessionApp">Ohodnotit aplikaci</string>
     <string name="rateSessionModalDescription">Jsme rádi, že se vám {app_name} líbí. Pokud máte chvíli času, ohodnoťte nás na {storevariant} abyste ostatním pomohli objevit soukromou a bezpečnou komunikaci!</string>
     <string name="read">Přečteno</string>
+    <string name="readMoreCapital">Další informace</string>
     <string name="readReceipts">Potvrzení o přečtení</string>
     <string name="readReceiptsDescription">Zobrazit potvrzení o přečtení pro všechny zprávy, které posíláte a přijímáte.</string>
     <string name="received">Přijato:</string>

app/src/main/res/values-b+cs+CZ/strings.xml

@@ -523,6 +523,8 @@
     <string name="feedbackDescription">Teile deine Erfahrungen mit {app_name}, indem du eine kurze Umfrage ausfüllst.</string>
     <string name="file">Datei</string>
     <string name="files">Dateien</string>
+    <string name="finalAppeal"><font color="0">Unser letzter Appell:</font>\n{app_name} wird in 90 Tagen eingestellt</string>
+    <string name="finalAppealDescription">Ihre Spenden haben geholfen, aber das {entity_stf_short} hat nur genug Mittel erhalten, um kritische Abläufe bis zum 8. Juli zu unterstützen.\n\nDie Entwicklung wurde pausiert, und ohne zusätzliche Finanzierung wird das STF eingestellt, was dazu führt, dass {app_name} aus den App Stores entfernt wird und essenzielle Dienste offline gehen.\n\nBitte helfen Sie uns, die Zukunft von Session zu sichern.</string>
     <string name="followSystemSettings">Systemeinstellungen übernehmen.</string>
     <string name="forever">Für immer</string>
     <string name="from">Von:</string>
@@ -1183,6 +1185,7 @@
     <string name="rateSessionModalDescriptionUpdated">{app_name} schaltet keine Werbung, verkauft keine Nutzerdaten und ist nur seinen Nutzern gegenüber verantwortlich. Ihre Bewertung bei {storevariant} hilft anderen dabei, Nachrichtendienste zu finden, denen ihre Privatsphäre wirklich wichtig ist.</string>
     <string name="rateUs">Bewerten Sie uns</string>
     <string name="read">Gelesen</string>
+    <string name="readMoreCapital">Weiterlesen</string>
     <string name="readReceipts">Lesebestätigungen</string>
     <string name="readReceiptsDescription">Zeige Lesebestätigungen für alle Nachrichten, die du sendest und erhältst.</string>
     <string name="received">Empfangen:</string>
@@ -1224,6 +1227,10 @@
         <item quantity="one">Mitglied entfernen</item>
         <item quantity="other">Mitglieder entfernen</item>
     </plurals>
+    <plurals name="removeMemberLowercase">
+        <item quantity="one">Mitglied entfernen</item>
+        <item quantity="other">Mitglieder entfernen</item>
+    </plurals>
     <plurals name="removeMemberMessages">
         <item quantity="one">Mitglied und dessen Nachrichten entfernen</item>
         <item quantity="other">Mitglieder und deren Nachrichten entfernen</item>