Added timestamps to serialized responses

A new version of the binary serialization format that includes timestamps for GmResponse.

5 files changed, 54 insertions, 8 deletions

diff --git a/src/app.c b/src/app.c
index cf9ef425..b38f8ae2 100644
--- a/src/app.c
+++ b/src/app.c
@@ -22,6 +22,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include "app.h"
 #include "bookmarks.h"
+#include "defs.h"
 #include "embedded.h"
 #include "gmcerts.h"
 #include "gmdocument.h"
@@ -255,9 +256,9 @@ static iBool loadState_App_(iApp *d) {
             printf("%s: format not recognized\n", cstr_String(path_File(f)));
             return iFalse;
         }
-        const int version = read32_File(f);
+        const uint32_t version = readU32_File(f);
         /* Check supported versions. */
-        if (version != 0) {
+        if (version > latest_FileVersion) {
             printf("%s: unsupported version\n", cstr_String(path_File(f)));
             return iFalse;
         }
@@ -303,7 +304,7 @@ static void saveState_App_(const iApp *d) {
     iFile *f = newCStr_File(concatPath_CStr(dataDir_App_, stateFileName_App_));
     if (open_File(f, writeOnly_FileMode)) {
         writeData_File(f, magicState_App_, 4);
-        write32_File(f, 0); /* version */
+        writeU32_File(f, latest_FileVersion); /* version */
         iConstForEach(ObjectList, i, iClob(listDocuments_App())) {
             if (isInstance_Object(i.object, &Class_DocumentWidget)) {
                 writeData_File(f, magicTabDocument_App_, 4);
diff --git a/src/defs.h b/src/defs.h
new file mode 100644
index 00000000..3280667e
--- /dev/null
+++ b/src/defs.h
@@ -0,0 +1,35 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
+#pragma once
+
+enum iFileVersion {
+    initial_FileVersion                 = 0,
+    addedResponseTimestamps_FileVersion = 1,
+    /* meta */
+    latest_FileVersion = 1
+};
+
+/* Icons */
+
+#define openLock_CStr   "\U0001f513"
+#define closedLock_CStr "\U0001f512"
diff --git a/src/gmcerts.c b/src/gmcerts.c
index c358573c..b5b7b371 100644
--- a/src/gmcerts.c
+++ b/src/gmcerts.c
@@ -21,6 +21,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include "gmcerts.h"
+#include "defs.h"
 
 #include <the_Foundation/file.h>
 #include <the_Foundation/fileinfo.h>
@@ -202,7 +203,7 @@ static void saveIdentities_GmCerts_(const iGmCerts *d) {
     iFile *f = new_File(collect_String(concatCStr_Path(&d->saveDir, identsFilename_GmCerts_)));
     if (open_File(f, writeOnly_FileMode)) {
         writeData_File(f, magicIdMeta_GmCerts_, 4);
-        writeU32_File(f, 0); /* version */
+        writeU32_File(f, latest_FileVersion); /* version */
         iConstForEach(PtrArray, i, &d->idents) {
             const iGmIdentity *ident = i.ptr;
             if (~ident->flags & temporary_GmIdentityFlag) {
@@ -245,7 +246,12 @@ static void loadIdentities_GmCerts_(iGmCerts *d) {
             printf("%s: format not recognized\n", cstr_String(path_File(f)));
             return;
         }
-        setVersion_Stream(stream_File(f), readU32_File(f));
+        const uint32_t version = readU32_File(f);
+        if (version > latest_FileVersion) {
+            printf("%s: unsupported version\n", cstr_String(path_File(f)));
+            return;
+        }
+        setVersion_Stream(stream_File(f), version);
         while (!atEnd_File(f)) {
             readData_File(f, sizeof(magic), magic);
             if (!memcmp(magic, magicIdentity_GmCerts_, sizeof(magic))) {
diff --git a/src/gmrequest.c b/src/gmrequest.c
index 7b6414d2..3faa2833 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -26,6 +26,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "app.h" /* dataDir_App() */
 #include "embedded.h"
 #include "ui/text.h"
+#include "defs.h"
 
 #include <the_Foundation/file.h>
 #include <the_Foundation/mutex.h>
@@ -86,7 +87,7 @@ void serialize_GmResponse(const iGmResponse *d, iStream *outs) {
     write32_Stream(outs, d->certFlags);
     serialize_Date(&d->certValidUntil, outs);
     serialize_String(&d->certSubject, outs);
-    /* TODO: Include the timestamp. */
+    writeU64_Stream(outs, d->when.ts.tv_sec);
 }
 
 void deserialize_GmResponse(iGmResponse *d, iStream *ins) {
@@ -96,6 +97,10 @@ void deserialize_GmResponse(iGmResponse *d, iStream *ins) {
     d->certFlags = read32_Stream(ins);
     deserialize_Date(&d->certValidUntil, ins);
     deserialize_String(&d->certSubject, ins);
+    iZap(d->when);
+    if (version_Stream(ins) >= addedResponseTimestamps_FileVersion) {
+        d->when.ts.tv_sec = readU64_Stream(ins);
+    }
 }
 
 /*----------------------------------------------------------------------------------------------*/
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index b56e9be8..558c320d 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -25,6 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "app.h"
 #include "audio/player.h"
 #include "command.h"
+#include "defs.h"
 #include "gmdocument.h"
 #include "gmrequest.h"
 #include "gmutil.h"
@@ -868,8 +869,6 @@ static void fetch_DocumentWidget_(iDocumentWidget *d) {
 }
 
 static void updateTrust_DocumentWidget_(iDocumentWidget *d, const iGmResponse *response) {
-#define openLock_CStr   "\U0001f513"
-#define closedLock_CStr "\U0001f512"
     if (response) {
         d->certFlags  = response->certFlags;
         d->certExpiry = response->certValidUntil;