diff --git a/komrade/backend/keymaker.py b/komrade/backend/keymaker.py index 5f67427..0110f14 100644 --- a/komrade/backend/keymaker.py +++ b/komrade/backend/keymaker.py @@ -388,7 +388,7 @@ class Keymaker(Logger): def uri_id(self): if not self._uri_id: pubkey = self.pubkey #find_pubkey() - self._uri_id = b64encode(pubkey) + self._uri_id = pubkey.data_b64 return self._uri_id @@ -567,6 +567,7 @@ Keymaker ({self}) is forging new keys for {name} self._uri_id = uri_id self.log(f'''Saved URI(=pubkey_b64) as a QR code: {ofnfn} {self.qr}''') + return ofnfn def save_keychain(self,name,keychain,keys_to_save=None,uri_id=None): if not keys_to_save: keys_to_save = list(keychain.keys()) diff --git a/komrade/backend/komrades.py b/komrade/backend/komrades.py index 9400435..71b43be 100644 --- a/komrade/backend/komrades.py +++ b/komrade/backend/komrades.py @@ -143,8 +143,9 @@ class Komrade(Caller): # save qr too: - qr_str=self.qr_str() - fnfn=self.save_uri_as_qrcode(b64enc(pubkey_b)) + uri_id = b64enc(pubkey_b) + qr_str=self.qr_str(uri_id=uri_id) + fnfn=self.save_uri_as_qrcode(uri_id) self.log(f'saved public key as QR code to:\n {fnfn}\n\n{qr_str}')