Commit cebea4a3 authored by Philipp Hörist's avatar Philipp Hörist

[omemo] Raise min version to 0.16.6

parent aecbfec2
...@@ -7,5 +7,5 @@ authors: Bahtiar `kalkin-` Gadimov <bahtiar@gadimov.de> ...@@ -7,5 +7,5 @@ authors: Bahtiar `kalkin-` Gadimov <bahtiar@gadimov.de>
Daniel Gultsch <daniel@gultsch.de> Daniel Gultsch <daniel@gultsch.de>
Philipp Hörist <philipp@hoerist.com> Philipp Hörist <philipp@hoerist.com>
homepage: https://dev.gajim.org/gajim/gajim-plugins/wikis/OmemoGajimPlugin homepage: https://dev.gajim.org/gajim/gajim-plugins/wikis/OmemoGajimPlugin
min_gajim_version: 0.16.5 min_gajim_version: 0.16.6
max_gajim_version: 0.16.9 max_gajim_version: 0.16.9
...@@ -49,8 +49,7 @@ CRYPTOGRAPHY_MISSING = 'You are missing Python-Cryptography' ...@@ -49,8 +49,7 @@ CRYPTOGRAPHY_MISSING = 'You are missing Python-Cryptography'
AXOLOTL_MISSING = 'You are missing Python-Axolotl or use an outdated version' AXOLOTL_MISSING = 'You are missing Python-Axolotl or use an outdated version'
PROTOBUF_MISSING = 'OMEMO cant import Google Protobuf, you can find help in ' \ PROTOBUF_MISSING = 'OMEMO cant import Google Protobuf, you can find help in ' \
'the GitHub Wiki' 'the GitHub Wiki'
GAJIM_VERSION = 'OMEMO only works with the latest Gajim version, get the ' \ GAJIM_VERSION = 'Your Gajim version is to old, OMEMO needs 0.16.6 or higher'
'latest version from gajim.org'
ERROR_MSG = '' ERROR_MSG = ''
NS_HINTS = 'urn:xmpp:hints' NS_HINTS = 'urn:xmpp:hints'
...@@ -87,7 +86,6 @@ if not ERROR_MSG: ...@@ -87,7 +86,6 @@ if not ERROR_MSG:
ERROR_MSG = 'Error: ' + str(e) ERROR_MSG = 'Error: ' + str(e)
GAJIM_VER = gajim.config.get('version') GAJIM_VER = gajim.config.get('version')
GROUPCHAT = False
if os.name != 'nt': if os.name != 'nt':
try: try:
...@@ -99,14 +97,8 @@ if os.name != 'nt': ...@@ -99,14 +97,8 @@ if os.name != 'nt':
ERROR_MSG = 'You are missing the Setuptools package.' ERROR_MSG = 'You are missing the Setuptools package.'
if not SETUPTOOLS_MISSING: if not SETUPTOOLS_MISSING:
if pkg.parse_version(GAJIM_VER) < pkg.parse_version('0.16.5'): if pkg.parse_version(GAJIM_VER) < pkg.parse_version('0.16.6'):
ERROR_MSG = GAJIM_VERSION ERROR_MSG = GAJIM_VERSION
if pkg.parse_version(GAJIM_VER) > pkg.parse_version('0.16.5'):
GROUPCHAT = True
else:
# if GAJIM_VER < 0.16.5, the Plugin fails on missing dependencys earlier
if not GAJIM_VER == '0.16.5':
GROUPCHAT = True
# pylint: disable=no-init # pylint: disable=no-init
# pylint: disable=attribute-defined-outside-init # pylint: disable=attribute-defined-outside-init
...@@ -149,15 +141,15 @@ class OmemoPlugin(GajimPlugin): ...@@ -149,15 +141,15 @@ class OmemoPlugin(GajimPlugin):
(ged.PRECORE, self.handle_outgoing_stanza), (ged.PRECORE, self.handle_outgoing_stanza),
'message-outgoing': 'message-outgoing':
(ged.PRECORE, self.handle_outgoing_event)} (ged.PRECORE, self.handle_outgoing_event)}
if GROUPCHAT:
self.events_handlers['gc-stanza-message-outgoing'] =\ self.events_handlers['gc-stanza-message-outgoing'] =\
(ged.PRECORE, self.handle_outgoing_gc_stanza) (ged.PRECORE, self.handle_outgoing_gc_stanza)
self.events_handlers['gc-presence-received'] =\ self.events_handlers['gc-presence-received'] =\
(ged.PRECORE, self.gc_presence_received) (ged.PRECORE, self.gc_presence_received)
self.events_handlers['gc-config-changed-received'] =\ self.events_handlers['gc-config-changed-received'] =\
(ged.PRECORE, self.gc_config_changed_received) (ged.PRECORE, self.gc_config_changed_received)
self.events_handlers['muc-admin-received'] =\ self.events_handlers['muc-admin-received'] =\
(ged.PRECORE, self.room_memberlist_received) (ged.PRECORE, self.room_memberlist_received)
self.config_dialog = OMEMOConfigDialog(self) self.config_dialog = OMEMOConfigDialog(self)
self.gui_extension_points = {'chat_control': (self.connect_ui, self.gui_extension_points = {'chat_control': (self.connect_ui,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment