diff --git a/gajim/__init__.py b/gajim/__init__.py index 47d4db6a12412aed3c6e449f9940e35f7d195b1f..7ec45f0fbbf67072be8f86dbc6a8b96d0d9009e6 100644 --- a/gajim/__init__.py +++ b/gajim/__init__.py @@ -1,6 +1,6 @@ import subprocess -__version__ = "0.16.11" +__version__ = "0.16.11.1" try: node = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True, diff --git a/gajim/common/check_paths.py b/gajim/common/check_paths.py index cdd547003c10ef3ca39858a9b144864c757a1088..60214611064ff9371e26331676a5b6bdad9604c9 100644 --- a/gajim/common/check_paths.py +++ b/gajim/common/check_paths.py @@ -116,6 +116,7 @@ def create_cache_db(): name TEXT, subscription INTEGER, ask BOOLEAN, + avatar_sha TEXT, PRIMARY KEY (account_jid_id, jid_id) ); diff --git a/gajim/common/logger.py b/gajim/common/logger.py index a1f5873bd33b915d2c55206c6d5bd474f0ef9d84..eb2cadb6216001dc4cf09509d9fb70279aa68dbd 100644 --- a/gajim/common/logger.py +++ b/gajim/common/logger.py @@ -979,8 +979,11 @@ class Logger: if name is None: name = '' - self.cur.execute('REPLACE INTO roster_entry VALUES(?, ?, ?, ?, ?)', - (account_jid_id, jid_id, name, + self.cur.execute(''' + REPLACE INTO roster_entry + (account_jid_id, jid_id, name, subscription, ask) + VALUES(?, ?, ?, ?, ?)''', ( + account_jid_id, jid_id, name, self.convert_human_subscription_values_to_db_api_values(sub), bool(ask))) if commit: diff --git a/gajim/common/optparser.py b/gajim/common/optparser.py index 273558b70cb7ed8882f7dc3b63446245361c0f06..dd2a2baa47f7068d4925da5c7414f10ff1e27df3 100644 --- a/gajim/common/optparser.py +++ b/gajim/common/optparser.py @@ -240,6 +240,8 @@ class OptionsParser: self.update_config_to_016104() if old < [0, 16, 10, 5] and new >= [0, 16, 10, 5]: self.update_config_to_016105() + if old < [0, 16, 11, 0] and new >= [0, 16, 11, 1]: + self.update_config_to_016111() app.logger.init_vars() app.logger.attach_cache_database() @@ -1012,3 +1014,18 @@ class OptionsParser: app.config.set('muc_restore_timeout', -1) app.config.set('restore_timeout', -1) app.config.set('version', '0.16.10.5') + + def update_config_to_016111(self): + con = sqlite.connect(logger.CACHE_DB_PATH) + cur = con.cursor() + try: + cur.executescript( + ''' + ALTER TABLE roster_entry ADD COLUMN 'avatar_sha' TEXT; + ''' + ) + con.commit() + except sqlite.OperationalError: + log.exception('Error') + con.close() + app.config.set('version', '0.16.11.1')