From 6bfb344697ed12122ef8cc5b5d6a3c9efc0d4c31 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Sun, 9 Dec 2018 20:57:12 +0100
Subject: [PATCH] Fixes #144 also for the core

---
 .../quasseldroid/ui/chat/info/core/CoreInfoFragment.kt   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/core/CoreInfoFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/core/CoreInfoFragment.kt
index d9ebac165..cf8f38aac 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/core/CoreInfoFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/core/CoreInfoFragment.kt
@@ -43,6 +43,7 @@ import de.kuschku.quasseldroid.util.missingfeatures.RequiredFeatures
 import de.kuschku.quasseldroid.util.service.ServiceBoundFragment
 import de.kuschku.quasseldroid.util.ui.BetterLinkMovementMethod
 import de.kuschku.quasseldroid.util.ui.LinkLongClickMenuHelper
+import org.threeten.bp.Instant
 import org.threeten.bp.ZoneId
 import org.threeten.bp.format.DateTimeFormatter
 import org.threeten.bp.format.FormatStyle
@@ -77,6 +78,7 @@ class CoreInfoFragment : ServiceBoundFragment() {
   lateinit var clients: RecyclerView
 
   private val dateTimeFormatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM)
+  private val dateFormatter = DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM)
 
   private val movementMethod = BetterLinkMovementMethod.newInstance()
 
@@ -93,7 +95,12 @@ class CoreInfoFragment : ServiceBoundFragment() {
     viewModel.coreInfo.toLiveData().observe(this, Observer {
       it?.orNull().let { data ->
         version.text = data?.quasselVersion?.let(Html::fromHtml)
-        versionDate.text = data?.quasselBuildDate?.let(Html::fromHtml)
+        val versionTime = data?.quasselBuildDate?.toLongOrNull()
+        val formattedVersionTime = if (versionTime != null)
+          dateFormatter.format(Instant.ofEpochSecond(versionTime).atZone(ZoneId.systemDefault()))
+        else
+          data?.quasselBuildDate?.let(Html::fromHtml)
+        versionDate.text = formattedVersionTime
 
         val features = viewModel.session.value?.orNull()?.features?.core
                        ?: QuasselFeatures.empty()
-- 
GitLab