hueso/gajim-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[pgp] Fix key migration

Browse Source
This commit is contained in:
Philipp Hörist
2019-04-16 23:27:05 +02:00
parent 0d99f3a2d5
commit 4cad7462b1
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pgp/backend/store.py
View File

@@ -50,9 +50,10 @@ class KeyStore:
def _migrate(self): def _migrate(self):
keys = {} keys = {}
attached_keys = app.config.get_per( attached_keys = app.config.get_per(
'accounts', self._account, 'attached_gpg_keys').split() 'accounts', self._account, 'attached_gpg_keys')
if attached_keys is None: if not attached_keys:
return return
attached_keys = attached_keys.split()
for i in range(len(attached_keys) // 2): for i in range(len(attached_keys) // 2):
keys[attached_keys[2 * i]] = attached_keys[2 * i + 1] keys[attached_keys[2 * i]] = attached_keys[2 * i + 1]
@@ -64,6 +65,9 @@ class KeyStore:
own_key_user = app.config.get_per('accounts', self._account, 'keyname') own_key_user = app.config.get_per('accounts', self._account, 'keyname')
if own_key_id: if own_key_id:
self.set_own_key_data((own_key_id, own_key_user)) self.set_own_key_data((own_key_id, own_key_user))
attached_keys = app.config.set_per(
'accounts', self._account, 'attached_gpg_keys', '')
self._log.info('Migration successful') self._log.info('Migration successful')
@delay_execution(500) @delay_execution(500)