Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 }
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -273,11 +273,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()

Expand Down Expand Up @@ -348,7 +349,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)
Expand Down
Binary file modified app/src/main/res/drawable-nodpi/cta_hero_donation.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.