Merge branch 'remove-seconds-from-account-expiry'

1 files changed, 5 insertions, 8 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
index 2893729917..d01fb0edfa 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
@@ -12,6 +12,10 @@ import net.mullvad.mullvadvpn.ui.widget.InformationView
 import org.joda.time.DateTime
 
 class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) {
+    private val dateStyle = DateFormat.MEDIUM
+    private val timeStyle = DateFormat.SHORT
+    private val expiryFormatter = DateFormat.getDateTimeInstance(dateStyle, timeStyle)
+
     private lateinit var accountExpiryView: InformationView
     private lateinit var accountNumberView: CopyableInformationView
 
@@ -53,20 +57,13 @@ class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) {
         accountNumberView.information = accountNumber
 
         if (accountExpiry != null) {
-            accountExpiryView.information = formatExpiry(accountExpiry)
+            accountExpiryView.information = expiryFormatter.format(accountExpiry.toDate())
         } else {
             accountExpiryView.information = null
             accountCache.fetchAccountExpiry()
         }
     }
 
-    private fun formatExpiry(expiry: DateTime): String {
-        val expiryInstant = expiry.toDate()
-        val formatter = DateFormat.getDateTimeInstance()
-
-        return formatter.format(expiryInstant)
-    }
-
     private fun logout() {
         clearAccountNumber()
         clearBackStack()