Fix formatting

[moonshot-ui.git] / src / moonshot-local-flat-file-store.vala

diff --git a/src/moonshot-local-flat-file-store.vala b/src/moonshot-local-flat-file-store.vala
index 41f8273..51d3986 100644 (file)
--- a/src/moonshot-local-flat-file-store.vala
+++ b/src/moonshot-local-flat-file-store.vala
@@ -9,22 +9,30 @@ public class LocalFlatFileStore : Object, IIdentityCardStore {
         store_id_cards ();
     }
 
-    public void update_card(IdCard card) {
+    public IdCard? update_card(IdCard card) {
         id_card_list.remove(card);
         id_card_list.add(card);
         store_id_cards ();
-     }
+        foreach(IdCard idcard in id_card_list)
+            if (idcard.display_name == card.display_name)
+                return idcard;
+        return null;
+    }
 
-     public void remove_card(IdCard card) {
+    public void remove_card(IdCard card) {
         id_card_list.remove(card);
         store_id_cards ();
     }
 
-     public LinkedList<IdCard> get_card_list() {
-          return id_card_list; 
-     }
+    public LinkedList<IdCard> get_card_list() {
+        return id_card_list; 
+    }
+
+    public IIdentityCardStore.StoreType get_store_type() {
+        return IIdentityCardStore.StoreType.FLAT_FILE;
+    }
      
-     private void load_id_cards() {
+    private void load_id_cards() {
         id_card_list.clear();
         var key_file = new KeyFile ();
         var path = get_data_dir ();
@@ -48,8 +56,11 @@ public class LocalFlatFileStore : Object, IIdentityCardStore {
                 id_card.password = key_file.get_string (identity, "Password");
                 id_card.services = key_file.get_string_list (identity, "Services");
                 id_card.display_name = key_file.get_string (identity, "DisplayName");
-                id_card.set_data ("pixbuf", find_icon ("avatar-default", 48));
-                
+                if (key_file.has_key (identity, "StorePassword")) {
+                    id_card.store_password = (key_file.get_string (identity, "StorePassword") == "yes");
+                } else {
+                    id_card.store_password = (id_card.password != null) && (id_card.password != "");
+                }
                 
                 if (key_file.has_key (identity, "Rules-Patterns") &&
                     key_file.has_key (identity, "Rules-AlwaysConfirm")) {
@@ -77,7 +88,7 @@ public class LocalFlatFileStore : Object, IIdentityCardStore {
                 stdout.printf ("Error:  %s\n", e.message);
             }
         }
-     }
+    }
 
     private string get_data_dir() {
         string path;
@@ -104,13 +115,17 @@ public class LocalFlatFileStore : Object, IIdentityCardStore {
             key_file.set_string (id_card.display_name, "Issuer", id_card.issuer ?? "");
             key_file.set_string (id_card.display_name, "DisplayName", id_card.display_name ?? "");
             key_file.set_string (id_card.display_name, "Username", id_card.username ?? "");
-            key_file.set_string (id_card.display_name, "Password", id_card.password ?? "");
+            if (id_card.store_password && (id_card.password != null))
+              key_file.set_string (id_card.display_name, "Password", id_card.password);
+            else
+              key_file.set_string (id_card.display_name, "Password", "");
             key_file.set_string_list (id_card.display_name, "Services", id_card.services ?? {});
 
             if (id_card.rules.length > 0) {
               key_file.set_string_list (id_card.display_name, "Rules-Patterns", rules_patterns);
               key_file.set_string_list (id_card.display_name, "Rules-AlwaysConfirm", rules_always_conf);
             }
+            key_file.set_string (id_card.display_name, "StorePassword", id_card.store_password ? "yes" : "no");
             
             // Trust anchor 
             key_file.set_string (id_card.display_name, "CA-Cert", id_card.trust_anchor.ca_cert ?? "");