Show account expiry in Account screen

3 files changed, 50 insertions, 0 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/AccountFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/AccountFragment.kt
index f023907a8c..3dda9e2f8b 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/AccountFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/AccountFragment.kt
@@ -1,5 +1,7 @@
 package net.mullvad.mullvadvpn
 
+import java.text.DateFormat
+
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -13,8 +15,13 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 
+import org.joda.time.DateTime
+
 class AccountFragment : Fragment() {
     private lateinit var parentActivity: MainActivity
+
+    private lateinit var accountExpiryContainer: View
+    private lateinit var accountExpiryDisplay: TextView
     private lateinit var accountNumberContainer: View
     private lateinit var accountNumberDisplay: TextView
 
@@ -37,7 +44,10 @@ class AccountFragment : Fragment() {
             parentActivity.onBackPressed()
         }
 
+        accountExpiryContainer = view.findViewById<View>(R.id.account_expiry_container)
         accountNumberContainer = view.findViewById<View>(R.id.account_number_container)
+
+        accountExpiryDisplay = view.findViewById<TextView>(R.id.account_expiry_display)
         accountNumberDisplay = view.findViewById<TextView>(R.id.account_number_display)
 
         updateViewJob = updateView()
@@ -52,6 +62,20 @@ class AccountFragment : Fragment() {
         if (accountNumber != null) {
             accountNumberDisplay.setText(accountCache.accountNumber.await())
             accountNumberContainer.visibility = View.VISIBLE
+
+            val accountExpiry = accountCache.accountExpiry.await()
+
+            if (accountExpiry != null) {
+                accountExpiryDisplay.setText(formatExpiry(accountExpiry))
+                accountExpiryContainer.visibility = View.VISIBLE
+            }
         }
     }
+
+    private fun formatExpiry(expiry: DateTime): String {
+        val expiryInstant = expiry.toDate()
+        val formatter = DateFormat.getDateTimeInstance()
+
+        return formatter.format(expiryInstant)
+    }
 }
diff --git a/android/src/main/res/layout/account.xml b/android/src/main/res/layout/account.xml
index fdec4af95d..2e7bba0340 100644
--- a/android/src/main/res/layout/account.xml
+++ b/android/src/main/res/layout/account.xml
@@ -73,5 +73,30 @@
                     android:text=""
                     />
         </LinearLayout>
+        <LinearLayout android:id="@+id/account_expiry_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="24dp"
+                android:orientation="vertical"
+                android:visibility="invisible"
+                >
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="9dp"
+                    android:textColor="@color/white60"
+                    android:textSize="13sp"
+                    android:textStyle="bold"
+                    android:text="@string/paid_until"
+                    />
+            <TextView android:id="@+id/account_expiry_display"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/white"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    android:text=""
+                    />
+        </LinearLayout>
     </LinearLayout>
 </LinearLayout>
diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml
index a0cfa0c162..a3a033e747 100644
--- a/android/src/main/res/values/strings.xml
+++ b/android/src/main/res/values/strings.xml
@@ -19,6 +19,7 @@
     <string name="quit">Quit</string>
 
     <string name="account_number">Account number</string>
+    <string name="paid_until">Paid until</string>
 
     <string name="unsecured_connection">Unsecured connection</string>
     <string name="creating_secure_connection">Creating secure connection</string>