From 184e37383cbbb88b0a2e06dd5f54ad8000c11094 Mon Sep 17 00:00:00 2001 From: lilia Date: Fri, 7 Aug 2015 16:39:04 -0700 Subject: [PATCH] Don't auto-populate the relay field According to server api docs, relay is optional when it is the same as our own server. // FREEBIE --- js/libtextsecure.js | 3 --- libtextsecure/api.js | 3 --- 2 files changed, 6 deletions(-) diff --git a/js/libtextsecure.js b/js/libtextsecure.js index e91e603fc..872318494 100644 --- a/js/libtextsecure.js +++ b/js/libtextsecure.js @@ -38900,7 +38900,6 @@ TextSecureServer = function () { ************************************************/ // Staging server var URL_BASE = "https://textsecure-service-staging.whispersystems.org"; - self.relay = "textsecure-service-staging.whispersystems.org"; var ATTACHMENT_HOST = "whispersystems-textsecure-attachments-staging.s3.amazonaws.com"; // This is the real server @@ -39151,8 +39150,6 @@ TextSecureServer = function () { } } var jsonData = { messages: messageArray }; - if (messageArray[0].relay !== undefined) - jsonData.relay = messageArray[0].relay; jsonData.timestamp = messageArray[0].timestamp; return doAjax({ diff --git a/libtextsecure/api.js b/libtextsecure/api.js index f541b1c52..04e3042e0 100644 --- a/libtextsecure/api.js +++ b/libtextsecure/api.js @@ -12,7 +12,6 @@ TextSecureServer = function () { ************************************************/ // Staging server var URL_BASE = "https://textsecure-service-staging.whispersystems.org"; - self.relay = "textsecure-service-staging.whispersystems.org"; var ATTACHMENT_HOST = "whispersystems-textsecure-attachments-staging.s3.amazonaws.com"; // This is the real server @@ -263,8 +262,6 @@ TextSecureServer = function () { } } var jsonData = { messages: messageArray }; - if (messageArray[0].relay !== undefined) - jsonData.relay = messageArray[0].relay; jsonData.timestamp = messageArray[0].timestamp; return doAjax({