app/assets/javascripts/presence_XmppClient.js.erb in social_stream-presence-1.1.0 vs app/assets/javascripts/presence_XmppClient.js.erb in social_stream-presence-2.0.0.beta1

- old
+ new

@@ -234,11 +234,11 @@ reconnectTimer = setTimeout ("PRESENCE.XMPPClient.onReconnect()", 5000); disconnectionFlag = true; } else if (status == Strophe.Status.AUTHFAIL) { PRESENCE.UTILITIES.log('Strophe authentication fail.'); if ((window.sessionStorage)&&(sessionStorage.getItem("ss_user_pass") != null)){ - sessionStorage.setItem("ss_user_pass",null); + sessionStorage.removeItem("ss_user_pass"); } disconnectionFlag = true; } else if (status == Strophe.Status.ERROR) { PRESENCE.UTILITIES.log('Strophe error.'); disconnectionFlag = true; @@ -288,10 +288,14 @@ if (reconnectAttempts>0) { reconnectAttempts--; PRESENCE.UIMANAGER.changeChatHeaderTitle(I18n.t('chat.reconnecting')) - connectToChat(user_jid,cookie,null); + if (authByCookie()){ + connectToChat(user_jid,cookie); + } else { + connectToChat(user_jid); + } reconnectTimer = setTimeout ("PRESENCE.XMPPClient.onReconnect()", 9000); } else { PRESENCE.UIMANAGER.changeChatHeaderTitle(I18n.t('chat.unableconnect'))