Merge pull request #2061 from session-foundation/fix/pro-expiring-cta-reset

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

Author: ThomasSession

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

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

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

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