Merge 201b13a20a into cc2af329d0

src/telemetry/telemetry.cpp

@@ -33,7 +33,9 @@ QJsonObject Telemetry::collectDeviceInformation() {
 bool Telemetry::sendDeviceInformation(QJsonObject data) {
     log("Telemetry data to be sent to server: " + QJsonDocument(data).toJson(QJsonDocument::Compact), className);
 
-    QNetworkRequest request(QUrl("http://23.163.0.39:4317/"));
+    // NOTE: This URL *will* change in the future
+    // TODO: Add error-handling
+    QNetworkRequest request(QUrl("http://192.168.3.1:8080/"));
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
 
     QNetworkAccessManager nam;
@@ -43,24 +45,15 @@ bool Telemetry::sendDeviceInformation(QJsonObject data) {
     }
     QByteArray responseData = reply->readAll();
     reply->deleteLater();
-    QString responseDataQstring = QString(responseData);
+
-    log("Telemetry server's response data was: '" + responseDataQstring + "'", className);
-    if(responseDataQstring != "Data received successfully") {
-        return false;
-    }
-    else {
     return true;
 }
-}
 
 void Telemetry::telemetrySlot() {
     QJsonObject data = collectDeviceInformation();
     if(sendDeviceInformation(data)) {
         writeFile("/mnt/onboard/.adds/inkbox/.config/24-telemetry/asked", "true");
         writeFile("/mnt/onboard/.adds/inkbox/.config/24-telemetry/enabled", "true");
-        showToast("Data sent successfully\nThank you!");
+        showToast("Data successfully sent\nThank you!");
-    }
-    else {
-        showToast("Error while sending data");
     }
 }