From 1afa18d7198aad23b1ee0dcf0dd35ba4b6e6fa41 Mon Sep 17 00:00:00 2001
From: Lukas Matena <lukasmatena@seznam.cz>
Date: Tue, 12 Oct 2021 15:34:18 +0200
Subject: [PATCH] SendSystemInfo: Use GET instead of ping to check internet
 connection

---
 src/slic3r/GUI/SendSystemInfoDialog.cpp | 22 ++++++++++------------
 src/slic3r/Utils/PresetUpdater.cpp      |  4 ----
 src/slic3r/Utils/PresetUpdater.hpp      |  2 ++
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/slic3r/GUI/SendSystemInfoDialog.cpp b/src/slic3r/GUI/SendSystemInfoDialog.cpp
index 72316215a..0b63d52de 100644
--- a/src/slic3r/GUI/SendSystemInfoDialog.cpp
+++ b/src/slic3r/GUI/SendSystemInfoDialog.cpp
@@ -6,6 +6,7 @@
 
 #include "slic3r/GUI/format.hpp"
 #include "slic3r/Utils/Http.hpp"
+#include "slic3r/Utils/PresetUpdater.hpp"
 
 #include "GUI_App.hpp"
 #include "GUI_Utils.hpp"
@@ -151,18 +152,15 @@ static bool should_dialog_be_shown()
     if (! new_version)
         return false;
 
-    std::cout << "Sending system info was not confirmed/declined in this version yet.\n"
-                 "Pinging prusa3d.com to see if it can be offered now." << std::endl;
-    bool is_internet =
-    #ifdef _WIN32
-        std::system((std::string("ping /n 1 /w 1 ") + SEND_SYSTEM_INFO_DOMAIN).data()) == 0; // 1 packet, 1 sec timeout
-    #elif __APPLE__
-        std::system((std::string("ping -c 1 -q -t 1 ") + SEND_SYSTEM_INFO_DOMAIN).data()) == 0; // 1 packet, quiet output, 1 sec timeout
-    #else // Linux/BSD
-        std::system((std::string("ping -c 1 -q -w 1 ") + SEND_SYSTEM_INFO_DOMAIN).data()) == 0; // 1 packet, quiet output, 1 sec timeout
-    #endif
-    std::cout << "Pinging prusa3d.com was " << (is_internet ? "" : "NOT ") << "successful." << std::endl;
-
+    // We'll misuse the version check to check internet connection here.
+    bool is_internet = false;
+    Http::get(wxGetApp().app_config->version_check_url())
+        .size_limit(SLIC3R_VERSION_BODY_MAX)
+        .timeout_max(2)
+        .on_complete([&](std::string, unsigned) {
+            is_internet = true;
+        })
+        .perform_sync();
     return is_internet;
 }
 
diff --git a/src/slic3r/Utils/PresetUpdater.cpp b/src/slic3r/Utils/PresetUpdater.cpp
index 13c631c9c..76ecc76d9 100644
--- a/src/slic3r/Utils/PresetUpdater.cpp
+++ b/src/slic3r/Utils/PresetUpdater.cpp
@@ -46,10 +46,6 @@ using Slic3r::GUI::Config::SnapshotDB;
 namespace Slic3r {
 
 
-enum {
-	SLIC3R_VERSION_BODY_MAX = 256,
-};
-
 static const char *INDEX_FILENAME = "index.idx";
 static const char *TMP_EXTENSION = ".download";
 
diff --git a/src/slic3r/Utils/PresetUpdater.hpp b/src/slic3r/Utils/PresetUpdater.hpp
index b7937c574..d0d18a7d8 100644
--- a/src/slic3r/Utils/PresetUpdater.hpp
+++ b/src/slic3r/Utils/PresetUpdater.hpp
@@ -13,6 +13,8 @@ class AppConfig;
 class PresetBundle;
 class Semver;
 
+const int SLIC3R_VERSION_BODY_MAX = 256;
+
 class PresetUpdater
 {
 public: