Rename textsecure.websocket and make it internal-only

js/key_worker.js

@@ -38415,18 +38415,17 @@ window.axolotl.sessions = {
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-;(function(){
-    'use strict';
 
 /*
-     * var socket = textsecure.websocket(url);
+ * var socket = TextSecureWebSocket(url);
  *
  * Returns an adamantium-reinforced super socket, capable of sending
  * app-level keep alives and automatically reconnecting.
  *
  */
 
-    window.textsecure.websocket = function (url) {
+TextSecureWebSocket = function (url) {
+    'use strict';
     var keepAliveTimer;
     var reconnectSemaphore = 0;
     var reconnectTimeout = 1000;
@@ -38499,7 +38498,6 @@ window.axolotl.sessions = {
     connect();
     return socketWrapper;
 };
-})();
 
 /* vim: ts=4:sw=4:expandtab
  *
@@ -39361,7 +39359,7 @@ window.textsecure.api = function () {
             var password = textsecure.storage.get("password");
             var params = 'login=%2B' + encodeURIComponent(user.substring(1)) + '&password=' + encodeURIComponent(password);
         }
-        return window.textsecure.websocket(URL+params)
+        return TextSecureWebSocket(URL+params)
     }
 
     self.getMessageWebsocket = function() {

js/libtextsecure.js

@@ -38414,18 +38414,17 @@ window.axolotl.sessions = {
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-;(function(){
-    'use strict';
 
 /*
-     * var socket = textsecure.websocket(url);
+ * var socket = TextSecureWebSocket(url);
  *
  * Returns an adamantium-reinforced super socket, capable of sending
  * app-level keep alives and automatically reconnecting.
  *
  */
 
-    window.textsecure.websocket = function (url) {
+TextSecureWebSocket = function (url) {
+    'use strict';
     var keepAliveTimer;
     var reconnectSemaphore = 0;
     var reconnectTimeout = 1000;
@@ -38498,7 +38497,6 @@ window.axolotl.sessions = {
     connect();
     return socketWrapper;
 };
-})();
 
 /* vim: ts=4:sw=4:expandtab
  *
@@ -39360,7 +39358,7 @@ window.textsecure.api = function () {
             var password = textsecure.storage.get("password");
             var params = 'login=%2B' + encodeURIComponent(user.substring(1)) + '&password=' + encodeURIComponent(password);
         }
-        return window.textsecure.websocket(URL+params)
+        return TextSecureWebSocket(URL+params)
     }
 
     self.getMessageWebsocket = function() {

libtextsecure/api.js

@@ -333,7 +333,7 @@ window.textsecure.api = function () {
             var password = textsecure.storage.get("password");
             var params = 'login=%2B' + encodeURIComponent(user.substring(1)) + '&password=' + encodeURIComponent(password);
         }
-        return window.textsecure.websocket(URL+params)
+        return TextSecureWebSocket(URL+params)
     }
 
     self.getMessageWebsocket = function() {

libtextsecure/websocket.js

@@ -13,18 +13,17 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-;(function(){
-    'use strict';
 
 /*
-     * var socket = textsecure.websocket(url);
+ * var socket = TextSecureWebSocket(url);
  *
  * Returns an adamantium-reinforced super socket, capable of sending
  * app-level keep alives and automatically reconnecting.
  *
  */
 
-    window.textsecure.websocket = function (url) {
+TextSecureWebSocket = function (url) {
+    'use strict';
     var keepAliveTimer;
     var reconnectSemaphore = 0;
     var reconnectTimeout = 1000;
@@ -97,4 +96,3 @@
     connect();
     return socketWrapper;
 };
-})();