X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=src%2Fmoonshot-id.vala;h=051d15dfa64806d6cfabbe3af4756ad87f8a1f3c;hb=8b84367198d6b30c9c24ce81cfad2e9ec7f48ecb;hp=b1f08606c20b4b44543b4cd6f45acfe64b9a8797;hpb=43e012afb2022bac4265c254dec9ab98cec993ba;p=moonshot-ui.git

diff --git a/src/moonshot-id.vala b/src/moonshot-id.vala
index b1f0860..051d15d 100644
--- a/src/moonshot-id.vala
+++ b/src/moonshot-id.vala
@@ -51,23 +51,25 @@ public class TrustAnchor : Object
     private string _subject = "";
     private string _subject_alt = "";
     private string _server_cert = "";
-
+    private string _datetime_added = "";
     public bool user_verified = false;
 
+    private static string fixup (string s) {
+        return (s == null ? "" : s.strip());
+    }
+
     public TrustAnchor(string ca_cert, string server_cert, string subject, string subject_alt, bool user_verified) {
-        _ca_cert = ca_cert;
-        _server_cert = server_cert;
-        _subject = subject;
-        _subject_alt = subject_alt;
+        _ca_cert = fixup(ca_cert);
+        _server_cert = fixup(server_cert);
+        _subject = fixup(subject);
+        _subject_alt = fixup(subject_alt);
         this.user_verified = user_verified;
+
+        // If we're reading from store, this will be overridden (see set_datetime_added)
+        _datetime_added = "";
     }
 
     public TrustAnchor.empty() {
-        _ca_cert = "";
-        _server_cert = "";
-        _subject = "";
-        _subject_alt = "";
-        this.user_verified = false;
     }
 
 
@@ -96,6 +98,12 @@ public class TrustAnchor : Object
         }
     }
 
+    public string datetime_added {
+        get {
+            return _datetime_added;
+        }
+    }
+
     public bool is_empty() {
         return ca_cert == "" && subject == "" && subject_alt == "" && server_cert == "";
     }
@@ -104,18 +112,37 @@ public class TrustAnchor : Object
         return server_cert == "" ? TrustAnchorType.CA_CERT : TrustAnchorType.SERVER_CERT;
     }
 
+    internal void set_datetime_added(string datetime) {
+        _datetime_added = fixup(datetime);
+    }
+
+    internal static string format_datetime_now() {
+        DateTime now = new DateTime.now_utc();
+        string dt = now.format("%b %d %T %Y %Z");
+        return dt;
+    }
+
     public int Compare(TrustAnchor other)
     {
-        if (this.ca_cert != other.ca_cert)
-            return 1;
-        if (this.subject != other.subject)
+        if (this.ca_cert != other.ca_cert) {
+            // IdCard.logger.trace("TrustAnchor.Compare: this.ca_cert='%s'; other.ca_cert='%s'".printf(this.ca_cert, other.ca_cert));
             return 1;
-        if (this.subject_alt != other.subject_alt)
+        }
+        if (this.subject != other.subject) {
+            // IdCard.logger.trace("TrustAnchor.Compare: this.subject='%s'; other.subject='%s'".printf(this.subject, other.subject));
             return 1;
-        if (this.server_cert != other.server_cert)
+        }
+        if (this.subject_alt != other.subject_alt) {
+            // IdCard.logger.trace("TrustAnchor.Compare: this.subject_alt='%s'; other.subject_alt='%s'".printf(this.subject_alt, other.subject_alt));
             return 1;
-        if (this.user_verified != other.user_verified)
+        }
+        if (this.server_cert != other.server_cert) {
+            // IdCard.logger.trace("TrustAnchor.Compare: this.server_cert=%s'; other.server_cert='%s'".printf(this.server_cert, other.server_cert));
             return 1;
+        }
+
+        // Do not compare the user_verified and datetime_added fields; they are not essential.
+
         return 0;
     }