From b75ab76c2ad621b27c1f034acb1bee6adc0e7648 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= <kuba@szczodrzynski.pl>
Date: Tue, 23 Feb 2021 12:48:17 +0100
Subject: [PATCH] [Vulcan/Web] Fix checking login expiry time.

---
 .../edziennik/data/api/edziennik/vulcan/DataVulcan.kt       | 6 +++---
 .../data/api/edziennik/vulcan/data/VulcanWebMain.kt         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/DataVulcan.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/DataVulcan.kt
index b822f660..649991d6 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/DataVulcan.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/DataVulcan.kt
@@ -17,7 +17,7 @@ import pl.szczodrzynski.edziennik.utils.Utils
 
 class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app, profile, loginStore) {
     fun isWebMainLoginValid() = symbol.isNotNullNorEmpty()
-            && (webExpiryTime[symbol] ?: 0) - 30 > currentTimeUnix()
+            && (webExpiryTime[symbol]?.toLongOrNull() ?: 0) - 30 > currentTimeUnix()
             && webAuthCookie[symbol].isNotNullNorEmpty()
             && webHost.isNotNullNorEmpty()
             && webType.isNotNullNorEmpty()
@@ -358,10 +358,10 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
      * If the time passes, the certificate needs to be POSTed again (if valid)
      * or re-generated.
      */
-    var webExpiryTime: Map<String, Long?> = mapOf()
+    var webExpiryTime: Map<String, String?> = mapOf()
         get() { mWebExpiryTime = mWebExpiryTime ?: loginStore.getLoginData("webExpiryTime", null)?.let { app.gson.fromJson(it, field.toMutableMap()::class.java) }; return mWebExpiryTime ?: mapOf() }
         set(value) { loginStore.putLoginData("webExpiryTime", app.gson.toJson(value)); mWebExpiryTime = value }
-    private var mWebExpiryTime: Map<String, Long?>? = null
+    private var mWebExpiryTime: Map<String, String?>? = null
 
     /**
      * EfebSsoAuthCookie retrieved after posting a certificate
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanWebMain.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanWebMain.kt
index f49e99c7..3cd52394 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanWebMain.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanWebMain.kt
@@ -86,7 +86,7 @@ open class VulcanWebMain(open val data: DataVulcan, open val lastSync: Long?) {
                     return
                 }
                 data.webExpiryTime = data.webExpiryTime.toMutableMap().also { map ->
-                    map[symbol] = Date.fromIso(certificate.expiryDate) / 1000L
+                    map[symbol] = (Date.fromIso(certificate.expiryDate) / 1000L).toString()
                 }
                 onResult(symbol, STATE_SUCCESS)
             }