From 22a2bcb3c76888977a1d3f8063d107447a75f8d6 Mon Sep 17 00:00:00 2001
From: quadrismegistus <ryan.heuser@gmail.com>
Date: Wed, 9 Sep 2020 16:35:38 +0100
Subject: [PATCH] communication chain complete. finally!

---
 komrade/backend/keymaker.py | 10 +++++-----
 komrade/backend/people.py   |  5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/komrade/backend/keymaker.py b/komrade/backend/keymaker.py
index 824b559..e12d0a4 100644
--- a/komrade/backend/keymaker.py
+++ b/komrade/backend/keymaker.py
@@ -280,11 +280,6 @@ class Keymaker(Logger):
         self.log('keys_saved =',keys_saved)
         self.log('keychain =',keychain)
 
-        # save pubkey as QR
-        if not 'pubkey' in keys_saved:
-            self.log('did not save pubkey in crypt, storing as QR...')
-            self.save_uri_as_qrcode(name=name, uri_id=uri_id, odir=PATH_QRCODES)
-
         # return keys!
         keys_returned = self.return_keychain(keychain,keys_to_return)
         return {'uri_id':uri_id,'_keychain':keys_returned}
@@ -333,6 +328,11 @@ class Keymaker(Logger):
                 self.crypt_keys.set(uri,keychain[keyname],prefix=f'/{keyname}/')
                 keys_saved_d[keyname] = keychain[keyname]
 
+        # save pubkey as QR
+        if not 'pubkey' in keys_saved_d:
+            self.log('did not save pubkey in crypt, storing as QR...')
+            self.save_uri_as_qrcode(name=name, uri_id=uri_id, odir=PATH_QRCODES)
+
         return (uri_id,keys_saved_d,keychain)
 
     def assemble(self,_keychain):
diff --git a/komrade/backend/people.py b/komrade/backend/people.py
index b592926..89aec3b 100644
--- a/komrade/backend/people.py
+++ b/komrade/backend/people.py
@@ -92,6 +92,7 @@ class Person(Caller):
 
         # get message back
         msg_obj = self.phone.ring_ring(msg_to_op)
+        phone_res = msg_obj.msg
         
         print('GOT BACK!!!',msg_obj)
 
@@ -102,8 +103,6 @@ class Person(Caller):
         self.log('got URI from Op:',uri_id)
         self.log('got returnd keys from Op:',returned_keys)
 
-        stop
-
         # better have the right keys
         assert set(KEYMAKER_DEFAULT_KEYS_TO_SAVE_ON_CLIENT) == set(returned_keys.keys())
 
@@ -111,6 +110,8 @@ class Person(Caller):
         saved_keys = self.save_keychain(name,returned_keys,uri_id=uri_id)
         self.log('saved keys!',saved_keys)
 
+        # save my qr?
+
         # better have the right keys
         # assert set(KEYMAKER_DEFAULT_KEYS_TO_SAVE) == set(saved_keys.keys())