Merge branch 'oams_port'

package.nw/GridTracker.html

@@ -1066,7 +1066,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
           <br />
           <div
             class="button"
-            onclick="require('nw.gui').Shell.openExternal('https://gridtracker.org/gt/gt_print.html');"
+            onclick="require('nw.gui').Shell.openExternal('http://app.gridtracker.org/gt_print.html');"
           >
             Print
           </div>

package.nw/lib/callsigns.js

@@ -234,11 +234,11 @@ function oqrsValuesChanged() {
 function oqrsDownload(fromSettings) {
   oqrsUpdatedTd.innerHTML = "<b><i>Downloading...</i></b>";
   getBuffer(
-    "https://gridtracker.org/gt/clublog.json",
+    "http://app.gridtracker.org/callsigns/clublog.json",
     processoqrsCallsigns,
     null,
-    "https",
-    443
+    "http",
+    80
   );
 }
 
@@ -449,11 +449,11 @@ function ulsDownload() {
   ulsUpdatedTd.innerHTML = "<b><i>Downloading...</i></b>";
   ulsCountTd.innerHTML = 0;
   getChunkedBuffer(
-    "https://gridtracker.org/gt/callsigns.txt",
+    "http://app.gridtracker.org/callsigns/callsigns.txt",
     processulsCallsigns,
     null,
-    "https",
-    443
+    "http",
+    80
   );
 }
 
@@ -570,17 +570,16 @@ function processulsCallsigns(data, flag, cookies, starting, finished) {
                 '")'
             );
             if (g_ulsCallsignsCount % 10000 == 0) {
-              tx.executeSql(
-                "SELECT count(*) as cnt FROM calls",
-                [],
-                function (rx, results) {
-                  var len = results.rows.length,
-                    i;
-                  if (len == 1) {
-                    ulsCountTd.innerHTML = results.rows[0]["cnt"];
-                  }
+              tx.executeSql("SELECT count(*) as cnt FROM calls", [], function (
+                rx,
+                results
+              ) {
+                var len = results.rows.length,
+                  i;
+                if (len == 1) {
+                  ulsCountTd.innerHTML = results.rows[0]["cnt"];
                 }
-              );
+              });
             }
           }
         }
@@ -600,22 +599,21 @@ function processulsCallsigns(data, flag, cookies, starting, finished) {
     g_ulsLoadTimer = setTimeout(ulsDownload, ulsWhenTimer * 1000);
 
     g_ulsDatabase.transaction(function (tx) {
-      tx.executeSql(
-        "SELECT count(*) as cnt FROM calls",
-        [],
-        function (rx, results) {
-          var len = results.rows.length,
-            i;
-          if (len == 1) {
-            g_ulsCallsignsCount = results.rows[0]["cnt"];
-            ulsCountTd.innerHTML = g_ulsCallsignsCount;
-            g_callsignLookups.ulsLastUpdate = timeNowSec();
-            saveCallsignSettings();
-            ulsSettingsDisplay();
-            updateQSO();
-          }
+      tx.executeSql("SELECT count(*) as cnt FROM calls", [], function (
+        rx,
+        results
+      ) {
+        var len = results.rows.length,
+          i;
+        if (len == 1) {
+          g_ulsCallsignsCount = results.rows[0]["cnt"];
+          ulsCountTd.innerHTML = g_ulsCallsignsCount;
+          g_callsignLookups.ulsLastUpdate = timeNowSec();
+          saveCallsignSettings();
+          ulsSettingsDisplay();
+          updateQSO();
         }
-      );
+      });
     });
   }
 

package.nw/lib/gt.js

@@ -9441,11 +9441,11 @@ function newMessageSetting(whichSetting) {
 function checkForNewVersion(showUptoDate) {
   if (typeof nw != "undefined")
     getBuffer(
-      "https://gridtracker.org/gt/version.txt?lang=" + g_localeString,
+      "http://app.gridtracker.org/version.txt?lang=" + g_localeString,
       versionCheck,
       showUptoDate,
-      "https",
-      443
+      "http",
+      80
     );
 }
 

package.nw/lib/gtws.js

@@ -62,7 +62,7 @@ function gtConnectChat() {
     return;
   }
 
-  var rnd = parseInt(Math.random() * 10) + 18260;
+  var rnd = parseInt(Math.random() * 10) + 18360;
   try {
     g_gtState = ChatState.connecting;
     g_gtChatSocket = new WebSocket("wss://oams.space:" + rnd);

package.nw/lib/roster.js

@@ -2663,11 +2663,11 @@ function stateChangedValue(what) {
     if (window.opener.g_mapSettings.offlineMode == false) {
       var callState = r_currentUSState.replace("CN-", "");
       getBuffer(
-        "https://gridtracker.org/gt/callsigns/" + callState + ".callsigns.json",
+        "http://app.gridtracker.org/callsigns/" + callState + ".callsigns.json",
         callsignResult,
         r_currentUSState,
-        "https",
-        443
+        "http",
+        80
       );
     } else {
       window.opener.goProcessRoster();
@@ -2915,11 +2915,11 @@ function init() {
 
   if (window.opener.g_mapSettings.offlineMode == false)
     getBuffer(
-      "https://gridtracker.org/gt/callsigns/manifest.json",
+      "http://app.gridtracker.org/callsigns/manifest.json",
       manifestResult,
       null,
-      "https",
-      443
+      "http",
+      80
     );
 
   loadSettings();