From 016d342f3b9a83605479ae11532f4af09528f42b Mon Sep 17 00:00:00 2001
From: Son NK <>
Date: Sun, 7 Jun 2020 00:09:06 +0200
Subject: [PATCH] load contact pgp keys in load_pgp_public_keys

---
 init_app.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/init_app.py b/init_app.py
index 22389fc2..b77088ea 100644
--- a/init_app.py
+++ b/init_app.py
@@ -1,5 +1,5 @@
 """Initial loading script"""
-from app.models import Mailbox
+from app.models import Mailbox, Contact
 from app.log import LOG
 from app.extensions import db
 from app.pgp_utils import load_public_key
@@ -16,6 +16,16 @@ def load_pgp_public_keys():
         if fingerprint != mailbox.pgp_finger_print:
             LOG.error("fingerprint %s different for mailbox %s", fingerprint, mailbox)
             mailbox.pgp_finger_print = fingerprint
+    db.session.commit()
+
+    for contact in Contact.query.filter(Contact.pgp_public_key != None).all():
+        LOG.d("Load PGP key for %s", contact)
+        fingerprint = load_public_key(contact.pgp_public_key)
+
+        # sanity check
+        if fingerprint != contact.pgp_finger_print:
+            LOG.error("fingerprint %s different for contact %s", fingerprint, contact)
+            contact.pgp_finger_print = fingerprint
 
     db.session.commit()