Merge branch 'android-wg-keys-show-local-timezone'

2 files changed, 11 insertions, 1 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 064339cab6..d4b7ae75d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,9 @@ Line wrap the file at 100 chars.                                              Th
 ### Fixed
 - Fix `mullvad relay update` to trigger a relay list download even if the existing cache is new.
 
+#### Android
+- Show WireGuard key age in local timezone instead of UTC.
+
 
 ## [2019.8] - 2019-09-23
 This release is identical to 2019.8-beta1
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/WireguardKeyFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/WireguardKeyFragment.kt
index 0c3eed1a4f..11396def27 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/WireguardKeyFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/WireguardKeyFragment.kt
@@ -19,7 +19,10 @@ import android.widget.ProgressBar
 import android.widget.TextView
 import android.widget.Toast
 
+import java.util.TimeZone
+
 import org.joda.time.DateTime
+import org.joda.time.DateTimeZone
 import org.joda.time.format.DateTimeFormat
 
 import net.mullvad.mullvadvpn.dataproxy.ConnectionProxy
@@ -294,6 +297,10 @@ class WireguardKeyFragment : Fragment() {
     }
 
     private fun formatKeyDateCreated(rfc3339: String): String {
-        return parentActivity.getString(R.string.wireguard_key_age) + " " + KEY_AGE_FORMAT.print(DateTime.parse(rfc3339, RFC3339_FORMAT))
+        val dateCreated = DateTime.parse(rfc3339, RFC3339_FORMAT).withZone(DateTimeZone.UTC)
+        val localTimezone = DateTimeZone.forTimeZone(TimeZone.getDefault())
+        return parentActivity.getString(R.string.wireguard_key_age) +
+            " " +
+            KEY_AGE_FORMAT.print(dateCreated.withZone(localTimezone))
     }
 }