From e248dd10686e5832c1e33940ae55d916d342327c Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Sat, 11 Apr 2020 11:48:38 +0200
Subject: [PATCH] Fix time zone handling on Android

---
 libnymea-app/system/systemcontroller.cpp | 22 ++++++++++++++++------
 libnymea-app/system/systemcontroller.h   |  1 +
 libnymea-app/types/types.cpp             |  1 -
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/libnymea-app/system/systemcontroller.cpp b/libnymea-app/system/systemcontroller.cpp
index 1f4a103b..ef513d2b 100644
--- a/libnymea-app/system/systemcontroller.cpp
+++ b/libnymea-app/system/systemcontroller.cpp
@@ -167,7 +167,11 @@ QStringList SystemController::timeZones() const
 
 QString SystemController::serverTimeZone() const
 {
-    return m_serverTime.timeZone().id();
+    // NOTE: Ideally we'd just set the TimeZone of our serverTime prooperly, however, there's a bug on Android
+    // Which doesn't allow to create QTimeZone objects by IANA id.... So, let's keep that separated in a string
+    // https://bugreports.qt.io/browse/QTBUG-83438
+//    return m_serverTime.timeZone().id();
+    return m_serverTimeZone;
 }
 
 void SystemController::setServerTimeZone(const QString &serverTimeZone)
@@ -212,9 +216,9 @@ void SystemController::getCapabilitiesResponse(const QVariantMap &data)
         m_jsonRpcClient->sendCommand("System.GetRepositories", this, "getRepositoriesResponse");
     }
 
-//    if (m_jsonRpcClient->ensureServerVersion("4.1")) {
+    if (m_jsonRpcClient->ensureServerVersion("4.1")) {
         m_jsonRpcClient->sendCommand("System.GetTime", this, "getServerTimeResponse");
-//    }
+    }
 }
 
 void SystemController::getUpdateStatusResponse(const QVariantMap &data)
@@ -243,7 +247,6 @@ void SystemController::getPackagesResponse(const QVariantMap &data)
 
 void SystemController::getRepositoriesResponse(const QVariantMap &data)
 {
-    qDebug() << "******** Repos" << data;
     foreach (const QVariant &repoVariant, data.value("params").toMap().value("repositories").toList()) {
         QString id = repoVariant.toMap().value("id").toString();
         QString displayName = repoVariant.toMap().value("displayName").toString();
@@ -266,15 +269,22 @@ void SystemController::enableRepositoryResponse(const QVariantMap &params)
 
 void SystemController::getServerTimeResponse(const QVariantMap &params)
 {
-    qDebug() << "Server time" << params;
     m_serverTime = QDateTime::fromSecsSinceEpoch(params.value("params").toMap().value("time").toUInt());
-    m_serverTime.setTimeZone(QTimeZone(params.value("params").toMap().value("timeZone").toString().toUtf8()));
+
+    // NOTE: Ideally we'd just set the TimeZone of our serverTime prooperly, however, there's a bug on Android
+    // Which doesn't allow to create QTimeZone objects by IANA id.... So, let's keep that separated in a string
+    // https://bugreports.qt.io/browse/QTBUG-83438
+
+//    m_serverTime.setTimeZone(QTimeZone(params.value("params").toMap().value("timeZone").toString().toUtf8()));
+    m_serverTimeZone = params.value("params").toMap().value("timeZone").toString();
+
     emit serverTimeChanged();
     emit serverTimeZoneChanged();
     m_automaticTimeAvailable = params.value("params").toMap().value("automaticTimeAvailable").toBool();
     emit automaticTimeAvailableChanged();
     m_automaticTime = params.value("params").toMap().value("automaticTime").toBool();
     emit automaticTimeChanged();
+    qDebug() << "Server time:" << m_serverTime << "Automatic Time available:" << m_automaticTimeAvailable << "Automatic time:" << m_automaticTime;
 }
 
 void SystemController::setTimeResponse(const QVariantMap &params)
diff --git a/libnymea-app/system/systemcontroller.h b/libnymea-app/system/systemcontroller.h
index cb40f550..013efe70 100644
--- a/libnymea-app/system/systemcontroller.h
+++ b/libnymea-app/system/systemcontroller.h
@@ -128,6 +128,7 @@ private:
     Repositories *m_repositories = nullptr;
 
     QDateTime m_serverTime;
+    QString m_serverTimeZone;
     QStringList m_timeZones;
     bool m_automaticTimeAvailable = false;
     bool m_automaticTime = false;
diff --git a/libnymea-app/types/types.cpp b/libnymea-app/types/types.cpp
index 006eb5e5..c5d8b432 100644
--- a/libnymea-app/types/types.cpp
+++ b/libnymea-app/types/types.cpp
@@ -248,6 +248,5 @@ QVariant Types::toUiValue(const QVariant &value, Types::Unit unit) const
             return value;
         }
     }
-    qDebug() << "**********" << value;
     return value;
 }