Bläddra i källkod

smacks: Also check for BOSH to determine support

JC Brand 5 år sedan
förälder
incheckning
51b818f916
2 ändrade filer med 7 tillägg och 6 borttagningar
  1. 2 2
      locale/af/LC_MESSAGES/converse.po
  2. 5 4
      src/headless/converse-smacks.js

+ 2 - 2
locale/af/LC_MESSAGES/converse.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \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"
 "Language-Team: Afrikaans <https://hosted.weblate.org/projects/conversejs/"
 "translations/af/>\n"
@@ -1790,7 +1790,7 @@ msgstr " bv. conversejs.org"
 
 #: dist/converse-no-dependencies.js:52539
 msgid "Fetch registration form"
-msgstr "Haal tans die registrasie vorm"
+msgstr "Haal die registrasie vorm"
 
 #: dist/converse-no-dependencies.js:52540
 msgid "Tip: A list of public XMPP providers is available"

+ 5 - 4
src/headless/converse-smacks.js

@@ -32,6 +32,9 @@ converse.plugins.add('converse-smacks', {
         });
 
         function isStreamManagementSupported () {
+            if (_converse.api.connection.isType('bosh') && !_converse.isTestEnv()) {
+                return false;
+            }
             return _converse.api.disco.stream.getFeature('sm', Strophe.NS.SM);
         }
 
@@ -95,7 +98,7 @@ converse.plugins.add('converse-smacks', {
         }
 
         function resetSessionData () {
-            _converse.session.save({
+            _converse.session && _converse.session.save({
                 'smacks_enabled': false,
                 'num_stanzas_handled': 0,
                 'num_stanzas_handled_by_server': 0,
@@ -206,9 +209,7 @@ converse.plugins.add('converse-smacks', {
             _converse.connection.addHandler(stanzaHandler);
             _converse.connection.addHandler(sendAck, Strophe.NS.SM, 'r');
             _converse.connection.addHandler(handleAck, Strophe.NS.SM, 'a');
-
-            if ((_converse.api.connection.isType('websocket') || _converse.isTestEnv()) &&
-                    _converse.session.get('smacks_stream_id')) {
+            if (_converse.session.get('smacks_stream_id')) {
                 await sendResumeStanza();
             } else {
                 resetSessionData();