Add device name and time left

21 files changed, 42 insertions, 15 deletions

diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/AccountExpiry.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/AccountExpiry.kt
index f5738ec21d..f856ef8c89 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/AccountExpiry.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/AccountExpiry.kt
@@ -1,28 +1,15 @@
 package net.mullvad.mullvadvpn.model
 
 import android.os.Parcelable
-import kotlin.time.Duration.Companion.milliseconds
-import kotlin.time.DurationUnit
 import kotlinx.parcelize.Parcelize
 import org.joda.time.DateTime
 
 sealed class AccountExpiry : Parcelable {
-    @Parcelize
-    data class Available(val expiryDateTime: DateTime) : AccountExpiry() {
-        override fun daysLeft(): Int =
-            (expiryDateTime.toInstant().millis - DateTime.now().toInstant().millis)
-                .milliseconds
-                .toInt(DurationUnit.DAYS)
-    }
+    @Parcelize data class Available(val expiryDateTime: DateTime) : AccountExpiry()
 
-    @Parcelize
-    data object Missing : AccountExpiry()
+    @Parcelize data object Missing : AccountExpiry()
 
     fun date(): DateTime? {
         return (this as? Available)?.expiryDateTime
     }
-
-    open fun daysLeft(): Int? {
-        return (this as? Available)?.daysLeft()
-    }
 }
diff --git a/android/lib/resource/src/main/res/values-da/strings.xml b/android/lib/resource/src/main/res/values-da/strings.xml
index bb26081112..b98455f7d9 100644
--- a/android/lib/resource/src/main/res/values-da/strings.xml
+++ b/android/lib/resource/src/main/res/values-da/strings.xml
@@ -175,6 +175,8 @@
     <string name="switch_location">Skift placering</string>
     <string name="tcp">TCP</string>
     <string name="toggle_vpn">Slå VPN til/fra</string>
+    <string name="top_bar_device_name">Enhedsnavn: %1$s</string>
+    <string name="top_bar_time_left">Resterende tid: %1$s</string>
     <string name="try_again">Prøv igen</string>
     <string name="udp">UDP</string>
     <string name="udp_over_tcp_port_info">Hvilken TCP-port UDP-over-TCP tilsløringsprotokollen skal forbinde til på VPN-serveren.</string>
diff --git a/android/lib/resource/src/main/res/values-de/strings.xml b/android/lib/resource/src/main/res/values-de/strings.xml
index 357e4209e3..19120efa7b 100644
--- a/android/lib/resource/src/main/res/values-de/strings.xml
+++ b/android/lib/resource/src/main/res/values-de/strings.xml
@@ -175,6 +175,8 @@
     <string name="switch_location">Ort wechseln</string>
     <string name="tcp">TCP</string>
     <string name="toggle_vpn">VPN umschalten</string>
+    <string name="top_bar_device_name">Gerätename: %1$s</string>
+    <string name="top_bar_time_left">Verbleibende Zeit: %1$s</string>
     <string name="try_again">Erneut versuchen</string>
     <string name="udp">UDP</string>
     <string name="udp_over_tcp_port_info">Mit welchem TCP-Port sich das UDP-über-TCP-Verschleierungsprotokoll auf dem VPN-Server verbinden soll.</string>
diff --git a/android/lib/resource/src/main/res/values-es/strings.xml b/android/lib/resource/src/main/res/values-es/strings.xml
index 1ca4ad0fa5..e5c5f7d657 100644
--- a/android/lib/resource/src/main/res/values-es/strings.xml
+++ b/android/lib/resource/src/main/res/values-es/strings.xml
@@ -175,6 +175,8 @@
     <string name="switch_location">Cambiar ubicación</string>
     <string name="tcp">TCP</string>
     <string name="toggle_vpn">Alternar VPN</string>
+    <string name="top_bar_device_name">Nombre del dispositivo: %1$s</string>
+    <string name="top_bar_time_left">Tiempo restante: %1$s</string>
     <string name="try_again">Volver a intentarlo</string>
     <string name="udp">UDP</string>
     <string name="udp_over_tcp_port_info">El puerto TCP al que se conectará el protocolo de ofuscación de UDP sobre TCP en el servidor VPN.</string>
diff --git a/android/lib/resource/src/main/res/values-fi/strings.xml b/android/lib/resource/src/main/res/values-fi/strings.xml
index eb02e63756..379d8dd4bb 100644
--- a/android/lib/resource/src/main/res/values-fi/strings.xml
+++ b/android/lib/resource/src/main/res/values-fi/strings.xml
@@ -175,6 +175,8 @@
     <string name="switch_location">Vaihda sijaintia</string>
     <string name="tcp">TCP</string>
     <string name="toggle_vpn">Vaihda VPN:ää</string>
+    <string name="top_bar_device_name">Laitteen nimi: %1$s</string>
+    <string name="top_bar_time_left">Aikaa jäljellä: %1$s</string>
     <string name="try_again">Yritä uudelleen</string>
     <string name="udp">UDP</string>
     <string name="udp_over_tcp_port_info">Määrittää, mihin VPN-palvelimen TCP-porttiin \"UDP TCP:n kautta\" -hämäysteknologia-protokollan tulee muodostaa yhteys.</string>
diff --git a/android/lib/resource/src/main/res/values-fr/strings.xml b/android/lib/resource/src/main/res/values-fr/strings.xml
index da970c6d89..9da5482c92 100644
--- a/android/lib/resource/src/main/res/values-fr/strings.xml
+++ b/android/lib/resource/src/main/res/values-fr/strings.xml
@@ -175,6 +175,8 @@
     <string name="switch_location">Changer de localisation</string>
     <string name="tcp">TCP</string>
     <string name="toggle_vpn">Activer/désactiver le VPN</string>
+    <string name="top_bar_device_name">Nom de l\'appareil : %1$s</string>
+    <string name="top_bar_time_left">Temps restant : %1$s</string>
     <string name="try_again">Réessayer</string>
     <string name="udp">UDP</string>
     <string name="udp_over_tcp_port_info">Le port TCP auquel le protocole de dissimulation UDP sur TCP doit se connecter sur le serveur VPN.</string>
diff --git a/android/lib/resource/src/main/res/values-it/strings.xml b/android/lib/resource/src/main/res/values-it/strings.xml
index c988e760cf..e91aaecdb9 100644
--- a/android/lib/resource/src/main/res/values-it/strings.xml
+++ b/android/lib/resource/src/main/res/values-it/strings.xml
@@ -175,6 +175,8 @@
     <string name="switch_location">Cambia posizione</string>
     <string name="tcp">TCP</string>
     <string name="toggle_vpn">Attiva/disattiva VPN</string>
+    <string name="top_bar_device_name">Nome del dispositivo: %1$s</string>
+    <string name="top_bar_time_left">Tempo rimasto: %1$s</string>
     <string name="try_again">Riprova</string>
     <string name="udp">UDP</string>
     <string name="udp_over_tcp_port_info">A quale porta TCP deve connettersi il protocollo di offuscamento UDP-over-TCP sul server VPN.</string>
diff --git a/android/lib/resource/src/main/res/values-ja/strings.xml b/android/lib/resource/src/main/res/values-ja/strings.xml
index 8c9ef84739..3112ec2b1c 100644
--- a/android/lib/resource/src/main/res/values-ja/strings.xml
+++ b/android/lib/resource/src/main/res/values-ja/strings.xml
@@ -175,6 +175,8 @@
     <string name="switch_location">場所を切り替える</string>
     <string name="tcp">TCP</string>
     <string name="toggle_vpn">VPNの切り替え</string>
+    <string name="top_bar_device_name">デバイス名: %1$s</string>
+    <string name="top_bar_time_left">残り時間: %1$s</string>
     <string name="try_again">再試行</string>
     <string name="udp">UDP</string>
     <string name="udp_over_tcp_port_info">UDP-over-TCP難読化プロトコルで接続する必要のあるVPNサーバーのTCPポートです。</string>
diff --git a/android/lib/resource/src/main/res/values-ko/strings.xml b/android/lib/resource/src/main/res/values-ko/strings.xml
index 209023a64e..b535966911 100644
--- a/android/lib/resource/src/main/res/values-ko/strings.xml
+++ b/android/lib/resource/src/main/res/values-ko/strings.xml
@@ -175,6 +175,8 @@
     <string name="switch_location">위치 전환</string>
     <string name="tcp">TCP</string>
     <string name="toggle_vpn">VPN 전환</string>
+    <string name="top_bar_device_name">장치 이름: %1$s</string>
+    <string name="top_bar_time_left">남은 시간: %1$s</string>
     <string name="try_again">다시 시도</string>
     <string name="udp">UDP</string>
     <string name="udp_over_tcp_port_info">UDP-over-TCP 난독 처리 프로토콜이 VPN 서버에서 연결해야 하는 TCP 포트입니다.</string>
diff --git a/android/lib/resource/src/main/res/values-my/strings.xml b/android/lib/resource/src/main/res/values-my/strings.xml
index 0aef2a2c2e..6a0f2ba377 100644
--- a/android/lib/resource/src/main/res/values-my/strings.xml
+++ b/android/lib/resource/src/main/res/values-my/strings.xml
@@ -175,6 +175,8 @@
     <string name="switch_location">တည်နေရာ ပြောင်းရန်</string>
     <string name="tcp">TCP</string>
     <string name="toggle_vpn">VPN ရွေးသုံးရန်</string>
+    <string name="top_bar_device_name">စက်အမည်- %1$s</string>
+    <string name="top_bar_time_left">ကျန်သည့် အချိန်- %1$s</string>
     <string name="try_again">ထပ်ကြိုးစားရန်</string>
     <string name="udp">UDP</string>
     <string name="udp_over_tcp_port_info">VPN ဆာဗာကို ဖွင့်ရန် ၎င်း TCP ပေါ့တ် UDP-over-TCP Obfuscation ပရိုတိုကောလ်နှင့် ချိတ်ဆက်ထားသင့်ပါသည်။</string>
diff --git a/android/lib/resource/src/main/res/values-nb/strings.xml b/android/lib/resource/src/main/res/values-nb/strings.xml
index 2b0e370bb3..6872608306 100644
--- a/android/lib/resource/src/main/res/values-nb/strings.xml
+++ b/android/lib/resource/src/main/res/values-nb/strings.xml
@@ -175,6 +175,8 @@
     <string name="switch_location">Bytt plassering</string>
     <string name="tcp">TCP</string>
     <string name="toggle_vpn">Velg VPN</string>
+    <string name="top_bar_device_name">Enhetsnavn: %1$s</string>
+    <string name="top_bar_time_left">Tid igjen: %1$s</string>
     <string name="try_again">Prøv på nytt</string>
     <string name="udp">UDP</string>
     <string name="udp_over_tcp_port_info">TCP-porten som UDP-over-TCP-tilsløringen skal koble til på VPN-serveren.</string>
diff --git a/android/lib/resource/src/main/res/values-nl/strings.xml b/android/lib/resource/src/main/res/values-nl/strings.xml
index cdbaa554c3..005f1c6907 100644
--- a/android/lib/resource/src/main/res/values-nl/strings.xml
+++ b/android/lib/resource/src/main/res/values-nl/strings.xml
@@ -175,6 +175,8 @@
     <string name="switch_location">Locatie wijzigen</string>
     <string name="tcp">TCP</string>
     <string name="toggle_vpn">VPN in-/uitschakelen</string>
+    <string name="top_bar_device_name">Apparaatnaam: %1$s</string>
+    <string name="top_bar_time_left">Resterende tijd: %1$s</string>
     <string name="try_again">Probeer het opnieuw</string>
     <string name="udp">UDP</string>
     <string name="udp_over_tcp_port_info">Met welke TCP-poort moet het UDP-over-TCP-obfuscatieprotocol verbinding maken op de VPN-server.</string>
diff --git a/android/lib/resource/src/main/res/values-pl/strings.xml b/android/lib/resource/src/main/res/values-pl/strings.xml
index 2e2e6ee267..98b69a66a8 100644
--- a/android/lib/resource/src/main/res/values-pl/strings.xml
+++ b/android/lib/resource/src/main/res/values-pl/strings.xml
@@ -175,6 +175,8 @@
     <string name="switch_location">Zmień lokalizację</string>
     <string name="tcp">TCP</string>
     <string name="toggle_vpn">Przełącz VPN</string>
+    <string name="top_bar_device_name">Nazwa urządzenia: %1$s</string>
+    <string name="top_bar_time_left">Pozostało: %1$s</string>
     <string name="try_again">Spróbuj ponownie</string>
     <string name="udp">UDP</string>
     <string name="udp_over_tcp_port_info">Port TCP, z którym powinien łączyć się protokół zaciemniania UDP-przez-TCP na serwerze VPN.</string>
diff --git a/android/lib/resource/src/main/res/values-pt/strings.xml b/android/lib/resource/src/main/res/values-pt/strings.xml
index 2fee06cab6..5dd4fd61ea 100644
--- a/android/lib/resource/src/main/res/values-pt/strings.xml
+++ b/android/lib/resource/src/main/res/values-pt/strings.xml
@@ -175,6 +175,8 @@
     <string name="switch_location">Alterar local</string>
     <string name="tcp">TCP</string>
     <string name="toggle_vpn">Alternar VPN</string>
+    <string name="top_bar_device_name">Nome do dispositivo: %1$s</string>
+    <string name="top_bar_time_left">Tempo restante: %1$s</string>
     <string name="try_again">Tentar novamente</string>
     <string name="udp">UDP</string>
     <string name="udp_over_tcp_port_info">A que porta TCP o protocolo de ofuscação UDP sobre TCP deve ligar-se no servidor VPN.</string>
diff --git a/android/lib/resource/src/main/res/values-ru/strings.xml b/android/lib/resource/src/main/res/values-ru/strings.xml
index 0fb01c88ad..7b9acc9195 100644
--- a/android/lib/resource/src/main/res/values-ru/strings.xml
+++ b/android/lib/resource/src/main/res/values-ru/strings.xml
@@ -175,6 +175,8 @@
     <string name="switch_location">Сменить местоположение</string>
     <string name="tcp">TCP</string>
     <string name="toggle_vpn">Включение VPN</string>
+    <string name="top_bar_device_name">Имя устройства: %1$s</string>
+    <string name="top_bar_time_left">Осталось времени: %1$s</string>
     <string name="try_again">Повторить попытку</string>
     <string name="udp">UDP</string>
     <string name="udp_over_tcp_port_info">TCP-порт, к которому должен подключаться протокол обфускации UDP через TCP на VPN-сервере.</string>
diff --git a/android/lib/resource/src/main/res/values-sv/strings.xml b/android/lib/resource/src/main/res/values-sv/strings.xml
index c65809dc5d..d8183b2435 100644
--- a/android/lib/resource/src/main/res/values-sv/strings.xml
+++ b/android/lib/resource/src/main/res/values-sv/strings.xml
@@ -175,6 +175,8 @@
     <string name="switch_location">Växla plats</string>
     <string name="tcp">TCP</string>
     <string name="toggle_vpn">Växla VPN</string>
+    <string name="top_bar_device_name">Enhetsnamn: %1$s</string>
+    <string name="top_bar_time_left">Tid kvar: %1$s</string>
     <string name="try_again">Försök igen</string>
     <string name="udp">UDP</string>
     <string name="udp_over_tcp_port_info">Vilken TCP-port som UDP-över-TCP-obfuskeringsprotokoll bör ansluta till på VPN-servern.</string>
diff --git a/android/lib/resource/src/main/res/values-th/strings.xml b/android/lib/resource/src/main/res/values-th/strings.xml
index 3f01840e0a..7afc8a7b44 100644
--- a/android/lib/resource/src/main/res/values-th/strings.xml
+++ b/android/lib/resource/src/main/res/values-th/strings.xml
@@ -175,6 +175,8 @@
     <string name="switch_location">สลับตำแหน่ง</string>
     <string name="tcp">TCP</string>
     <string name="toggle_vpn">เปิด/ปิด VPN</string>
+    <string name="top_bar_device_name">ชื่ออุปกรณ์: %1$s</string>
+    <string name="top_bar_time_left">เหลือเวลา: %1$s</string>
     <string name="try_again">ลองอีกครั้ง</string>
     <string name="udp">UDP</string>
     <string name="udp_over_tcp_port_info">พอร์ต TCP ใดที่โพรโทคอลการทำให้ข้อมูลยุ่งเหยิง UDP-ผ่าน-TCP ควรเชื่อมต่อบนเซิร์ฟเวอร์ VPN</string>
diff --git a/android/lib/resource/src/main/res/values-tr/strings.xml b/android/lib/resource/src/main/res/values-tr/strings.xml
index 08ff5f47e6..908f9ce2d9 100644
--- a/android/lib/resource/src/main/res/values-tr/strings.xml
+++ b/android/lib/resource/src/main/res/values-tr/strings.xml
@@ -175,6 +175,8 @@
     <string name="switch_location">Konum değiştir</string>
     <string name="tcp">TCP</string>
     <string name="toggle_vpn">VPN\'i aç/kapat</string>
+    <string name="top_bar_device_name">Cihaz adı: %1$s</string>
+    <string name="top_bar_time_left">Kalan süre: %1$s</string>
     <string name="try_again">Tekrar dene</string>
     <string name="udp">UDP</string>
     <string name="udp_over_tcp_port_info">TCP üzerinden UDP gizleme protokolünün VPN sunucusunda hangi TCP portuna bağlanması gerekiyor.</string>
diff --git a/android/lib/resource/src/main/res/values-zh-rCN/strings.xml b/android/lib/resource/src/main/res/values-zh-rCN/strings.xml
index 174262c638..667ffbcde9 100644
--- a/android/lib/resource/src/main/res/values-zh-rCN/strings.xml
+++ b/android/lib/resource/src/main/res/values-zh-rCN/strings.xml
@@ -175,6 +175,8 @@
     <string name="switch_location">切换位置</string>
     <string name="tcp">TCP</string>
     <string name="toggle_vpn">切换 VPN</string>
+    <string name="top_bar_device_name">设备名称：%1$s</string>
+    <string name="top_bar_time_left">剩余时间：%1$s</string>
     <string name="try_again">重试</string>
     <string name="udp">UDP</string>
     <string name="udp_over_tcp_port_info">UDP-over-TCP 混淆协议应连接到 VPN 服务器上的哪个 TCP 端口。</string>
diff --git a/android/lib/resource/src/main/res/values-zh-rTW/strings.xml b/android/lib/resource/src/main/res/values-zh-rTW/strings.xml
index 70b0d42c55..5378b92550 100644
--- a/android/lib/resource/src/main/res/values-zh-rTW/strings.xml
+++ b/android/lib/resource/src/main/res/values-zh-rTW/strings.xml
@@ -175,6 +175,8 @@
     <string name="switch_location">切換位置</string>
     <string name="tcp">TCP</string>
     <string name="toggle_vpn">切換 VPN</string>
+    <string name="top_bar_device_name">裝置名稱：%1$s</string>
+    <string name="top_bar_time_left">剩餘時間：%1$s</string>
     <string name="try_again">再試一次</string>
     <string name="udp">UDP</string>
     <string name="udp_over_tcp_port_info">UDP-over-TCP 混淆通訊協定應連線到 VPN 伺服器上的哪個 TCP 連接埠。</string>
diff --git a/android/lib/resource/src/main/res/values/strings.xml b/android/lib/resource/src/main/res/values/strings.xml
index bc9630e974..c9c837d38d 100644
--- a/android/lib/resource/src/main/res/values/strings.xml
+++ b/android/lib/resource/src/main/res/values/strings.xml
@@ -224,4 +224,6 @@
     <string name="verifying_voucher">Verifying voucher…</string>
     <string name="added_to_your_account">%s was added to your account.</string>
     <string name="less_than_one_day">less than one day</string>
+    <string name="top_bar_time_left">Time left: %s</string>
+    <string name="top_bar_device_name">Device name: %s</string>
 </resources>