Update to latest membership status response

PrimalHQ · Nov 12, 2024 · 778fd01 · 778fd01
1 parent 6caa51c
commit 778fd01
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/app/src/main/kotlin/net/primal/android/premium/api/model/MembershipStatusResponse.kt b/app/src/main/kotlin/net/primal/android/premium/api/model/MembershipStatusResponse.kt
@@ -13,9 +13,9 @@ data class MembershipStatusResponse(
     @SerialName("primal_vip_profile") val primalVipProfile: String,
     @SerialName("used_storage") val usedStorage: Long,
     @SerialName("max_storage") val maxStorage: Long,
-    @SerialName("expires_on") val expiresOn: Long,
     @SerialName("cohort_1") val cohort1: String,
     @SerialName("cohort_2") val cohort2: String,
+    @SerialName("expires_on") val expiresOn: Long? = null,
     @SerialName("recurring") val recurring: Boolean = false,
     @SerialName("renews_on") val renewsOn: Long? = null,
 )
diff --git a/app/src/main/kotlin/net/primal/android/premium/domain/PremiumMembership.kt b/app/src/main/kotlin/net/primal/android/premium/domain/PremiumMembership.kt
@@ -13,11 +13,11 @@ data class PremiumMembership(
     val vipProfile: String,
     val usedStorageInBytes: Long,
     val maxStorageInBytes: Long,
-    val expiresOn: Long,
     val cohort1: String,
     val cohort2: String,
+    val expiresOn: Long? = null,
     val recurring: Boolean = false,
     val renewsOn: Long? = null,
 ) {
-    fun isExpired() = Clock.System.now().epochSeconds > expiresOn
+    fun isExpired() = expiresOn != null && Clock.System.now().epochSeconds > expiresOn
 }
diff --git a/app/src/main/kotlin/net/primal/android/premium/ui/PrimalPremiumTable.kt b/app/src/main/kotlin/net/primal/android/premium/ui/PrimalPremiumTable.kt
@@ -75,11 +75,13 @@ fun PrimalPremiumTable(
                 value = when {
                     premiumMembership.recurring && premiumMembership.renewsOn != null ->
                         Instant.ofEpochSecond(premiumMembership.renewsOn)
+                            .formatToDefaultDateFormat(FormatStyle.LONG)
 
-                    else ->
-                        Instant.ofEpochSecond(premiumMembership.expiresOn)
-                }
-                    .formatToDefaultDateFormat(FormatStyle.LONG),
+                    premiumMembership.expiresOn != null -> Instant.ofEpochSecond(premiumMembership.expiresOn)
+                        .formatToDefaultDateFormat(FormatStyle.LONG)
+
+                    else -> stringResource(R.string.premium_table_never)
+                },
                 alwaysHideApply = true,
             )
         }