Commit 51b818f9 authored by JC Brand's avatar JC Brand

smacks: Also check for BOSH to determine support

parent 7ee6152c
...@@ -8,7 +8,7 @@ msgstr "" ...@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: Converse.js 0.4\n" "Project-Id-Version: Converse.js 0.4\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-13 15:01+0200\n" "POT-Creation-Date: 2019-09-13 15:01+0200\n"
"PO-Revision-Date: 2019-08-23 10:16+0200\n" "PO-Revision-Date: 2019-09-20 12:05+0200\n"
"Last-Translator: JC Brand <jc@opkode.com>\n" "Last-Translator: JC Brand <jc@opkode.com>\n"
"Language-Team: Afrikaans <https://hosted.weblate.org/projects/conversejs/" "Language-Team: Afrikaans <https://hosted.weblate.org/projects/conversejs/"
"translations/af/>\n" "translations/af/>\n"
...@@ -1790,7 +1790,7 @@ msgstr " bv. conversejs.org" ...@@ -1790,7 +1790,7 @@ msgstr " bv. conversejs.org"
#: dist/converse-no-dependencies.js:52539 #: dist/converse-no-dependencies.js:52539
msgid "Fetch registration form" msgid "Fetch registration form"
msgstr "Haal tans die registrasie vorm" msgstr "Haal die registrasie vorm"
#: dist/converse-no-dependencies.js:52540 #: dist/converse-no-dependencies.js:52540
msgid "Tip: A list of public XMPP providers is available" msgid "Tip: A list of public XMPP providers is available"
......
...@@ -32,6 +32,9 @@ converse.plugins.add('converse-smacks', { ...@@ -32,6 +32,9 @@ converse.plugins.add('converse-smacks', {
}); });
function isStreamManagementSupported () { function isStreamManagementSupported () {
if (_converse.api.connection.isType('bosh') && !_converse.isTestEnv()) {
return false;
}
return _converse.api.disco.stream.getFeature('sm', Strophe.NS.SM); return _converse.api.disco.stream.getFeature('sm', Strophe.NS.SM);
} }
...@@ -95,7 +98,7 @@ converse.plugins.add('converse-smacks', { ...@@ -95,7 +98,7 @@ converse.plugins.add('converse-smacks', {
} }
function resetSessionData () { function resetSessionData () {
_converse.session.save({ _converse.session && _converse.session.save({
'smacks_enabled': false, 'smacks_enabled': false,
'num_stanzas_handled': 0, 'num_stanzas_handled': 0,
'num_stanzas_handled_by_server': 0, 'num_stanzas_handled_by_server': 0,
...@@ -206,9 +209,7 @@ converse.plugins.add('converse-smacks', { ...@@ -206,9 +209,7 @@ converse.plugins.add('converse-smacks', {
_converse.connection.addHandler(stanzaHandler); _converse.connection.addHandler(stanzaHandler);
_converse.connection.addHandler(sendAck, Strophe.NS.SM, 'r'); _converse.connection.addHandler(sendAck, Strophe.NS.SM, 'r');
_converse.connection.addHandler(handleAck, Strophe.NS.SM, 'a'); _converse.connection.addHandler(handleAck, Strophe.NS.SM, 'a');
if (_converse.session.get('smacks_stream_id')) {
if ((_converse.api.connection.isType('websocket') || _converse.isTestEnv()) &&
_converse.session.get('smacks_stream_id')) {
await sendResumeStanza(); await sendResumeStanza();
} else { } else {
resetSessionData(); resetSessionData();
......
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