Fixed bugs in tracking TrustAnchor datetime-added

[moonshot-ui.git] / src / moonshot-identities-manager.vala

diff --git a/src/moonshot-identities-manager.vala b/src/moonshot-identities-manager.vala
index 1f390cc..6ef9de6 100644 (file)
--- a/src/moonshot-identities-manager.vala
+++ b/src/moonshot-identities-manager.vala
@@ -142,7 +142,7 @@ public class IdentityManagerModel : Object {
         return true;
     }
 
-    private bool remove_duplicates(IdCard card)
+    private bool remove_duplicates(IdCard new_card)
     {
         bool duplicate_found = false;
         bool found = false;
@@ -150,11 +150,17 @@ public class IdentityManagerModel : Object {
             var cards = this.store.get_card_list();
             found = false;
             foreach (IdCard id_card in cards) {
-                if ((card != id_card) && (id_card.nai == card.nai)) {
-                    stdout.printf("removing duplicate id for '%s'\n", card.nai);
-                    logger.trace("removing duplicate id for '%s'\n".printf(card.nai));
+                if ((new_card != id_card) && (id_card.nai == new_card.nai)) {
+                    stdout.printf("removing duplicate id for '%s'\n", new_card.nai);
+                    logger.trace("removing duplicate id for '%s'\n".printf(new_card.nai));
                     remove_card_internal(id_card);
                     found = duplicate_found = true;
+
+                    if (new_card.trust_anchor.Compare(id_card.trust_anchor) == 0) {
+                        logger.trace("Old and new cards have same trust anchor. Re-using the datetime_added and user_verified fields from the old card.");
+                        new_card.trust_anchor.set_datetime_added(id_card.trust_anchor.datetime_added);
+                        new_card.trust_anchor.user_verified = id_card.trust_anchor.user_verified;
+                    }
                     break;
                 }
             }
@@ -182,8 +188,10 @@ public class IdentityManagerModel : Object {
     }
 
     public void add_card(IdCard card, bool force_flat_file_store) {
-        if (card.temporary)
+        if (card.temporary) {
+            logger.trace("add_card: card is temporary; returning.");
             return;
+        }
 
         string candidate;
         IIdentityCardStore.StoreType saved_store_type = get_store_type();
@@ -200,12 +208,18 @@ public class IdentityManagerModel : Object {
 
         if (!card.store_password)
             password_table.CachePassword(card, store);
+
+        logger.trace("add_card: Adding card '%s' with services: '%s'"
+                     .printf(card.display_name, card.get_services_string("; ")));
+
         store.add_card(card);
         set_store_type(saved_store_type);
         card_list_changed();
     }
 
     public IdCard update_card(IdCard card) {
+        logger.trace("update_card");
+
         IdCard retval;
         if (card.temporary) {
             retval = card;
@@ -236,6 +250,8 @@ public class IdentityManagerModel : Object {
         return false;
     }
 
+    // The name is misleading: This not only sets the store type,
+    // it also creates a new store instance, which loads the card data.
     public void set_store_type(IIdentityCardStore.StoreType type) {
         if ((store != null) && (store.get_store_type() == type))
             return;
@@ -250,6 +266,21 @@ public class IdentityManagerModel : Object {
             store = new LocalFlatFileStore();
             break;
         }
+
+        // Loop through the loaded IDs. If any trust anchors are old enough that we didn't record
+        // the datetime_added, add it now.
+        string before_now = _("Before ") + TrustAnchor.format_datetime_now();
+        bool save_needed = false;
+        foreach (IdCard id in this.store.get_card_list()) {
+            if (!id.trust_anchor.is_empty() && id.trust_anchor.datetime_added == "") {
+                logger.trace("set_store_type : Set ta_datetime_added for old trust anchor on '%s' to '%s'".printf(id.display_name, before_now));
+                id.trust_anchor.set_datetime_added(before_now);
+                save_needed = true;
+            }
+        }
+        if (save_needed) {
+            this.store.store_id_cards();
+        }
     }
 
     public IIdentityCardStore.StoreType get_store_type() {
@@ -261,7 +292,7 @@ public class IdentityManagerModel : Object {
             // The 'NoIdentity' card is non-trivial if it has services or rules.
             // All other cards are automatically non-trivial.
             if ((!card.is_no_identity()) || 
-                (card.services.length > 0) ||
+                (card.services.size > 0) ||
                 (card.rules.length > 0)) {
                 return true;
             }