Skip to content

SES-5360 - reset expiry CTAs when user is back active #2061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ThomasSession merged 1 commit into from
Mar 19, 2026
Merged

SES-5360 - reset expiry CTAs when user is back active #2061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions app/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ interface TextSecurePreferences {
fun setHasSeenProExpiring()
fun hasSeenProExpired(): Boolean
fun setHasSeenProExpired()
fun clearProExpiryView()
fun watchPostProStatus(): StateFlow<Boolean>
fun setShownCallWarning(): Boolean
fun setShownCallNotification(): Boolean
Expand Down Expand Up @@ -994,6 +995,11 @@ class AppTextSecurePreferences @Inject constructor(
setBooleanPreference(HAS_SEEN_PRO_EXPIRED, true)
}

override fun clearProExpiryView() {
setBooleanPreference(HAS_SEEN_PRO_EXPIRED, false)
setBooleanPreference(HAS_SEEN_PRO_EXPIRING, false)
}

override fun watchPostProStatus(): StateFlow<Boolean> {
return postProLaunchState
}
Expand Down
5 changes: 4 additions & 1 deletion app/src/main/java/org/thoughtcrime/securesms/home/HomeViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,10 @@ class HomeViewModel @Inject constructor(
var showExpiring: Boolean = false
var showExpired: Boolean = false

if(subscription.type is ProStatus.Active.Expiring
if(subscription.type is ProStatus.Active &&
(prefs.hasSeenProExpiring() || prefs.hasSeenProExpired())){
prefs.clearProExpiryView() // reset expiry view if the user is active again
} else if(subscription.type is ProStatus.Active.Expiring
&& !prefs.hasSeenProExpiring()
){
val validUntil = subscription.type.renewingAt
Expand Down