From c9e01353a0245f777f363c77e03bd2b8a3ecdf3d Mon Sep 17 00:00:00 2001
From: Ale Martinez <amtriathlon@gmail.com>
Date: Fri, 30 Apr 2021 21:26:02 -0300
Subject: [PATCH] Equipment update on Strava download

This is a simpler and more efficient version of 96c8508, no need to use
getGearById service since SummaryGear is already available in DetailedActivity
---
 src/Cloud/Strava.cpp | 55 ++++++--------------------------------------
 src/Cloud/Strava.h   |  1 -
 2 files changed, 7 insertions(+), 49 deletions(-)

diff --git a/src/Cloud/Strava.cpp b/src/Cloud/Strava.cpp
index b730f0bc5..8494b5d37 100644
--- a/src/Cloud/Strava.cpp
+++ b/src/Cloud/Strava.cpp
@@ -686,53 +686,6 @@ Strava::addSamples(RideFile* ret, QString remoteid)
     }
 }
 
-void
-Strava::addEquipment(RideFile* ret, QString gear_id)
-{
-    printd("Strava::addEquipment(%s)\n", gear_id.toStdString().c_str());
-
-    // do we have a token ?
-    QString token = getSetting(GC_STRAVA_TOKEN, "").toString();
-    if (token == "") return;
-
-    // lets connect and get equipment info
-    QString urlstr = QString("https://www.strava.com/api/v3/gear/%1").arg(gear_id);
-
-    QUrl url = QUrl( urlstr );
-    printd("url:%s\n", url.url().toStdString().c_str());
-
-    // request using the bearer token
-    QNetworkRequest request(url);
-    request.setRawHeader("Authorization", (QString("Bearer %1").arg(token)).toLatin1());
-
-    // put the file
-    QNetworkReply *reply = nam->get(request);
-
-    // blocking request
-    QEventLoop loop;
-    connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));
-    loop.exec();
-
-    if (reply->error() != QNetworkReply::NoError) {
-        qDebug() << "error" << reply->errorString();
-        return;
-    }
-    // did we get a good response ?
-    QByteArray r = reply->readAll();
-    printd("response: %s\n", r.toStdString().c_str());
-
-    QJsonParseError parseError;
-    QJsonDocument document = QJsonDocument::fromJson(r, &parseError);
-
-    // if path was returned all is good, lets set Equipment
-    if (parseError.error == QJsonParseError::NoError) {
-        // Just name, for now
-        if (!document["name"].isNull()) {
-            ret->setTag("Equipment", document["name"].toString());
-        }
-    }
-}
-
 void
 Strava:: fixLapSwim(RideFile* ret, QJsonArray laps)
 {
@@ -973,6 +926,13 @@ Strava::prepareResponse(QByteArray* data)
             ride->setTag("Trainer", each["trainer"].toBool() ? "1" : "0");
         }
 
+        if (each["gear"].isObject()) {
+            QJsonObject gear = each["gear"].toObject();
+            if (gear["name"].isString()) {
+                ride->setTag("Equipment", gear["name"].toString());
+            }
+        }
+
         if (each["manual"].toBool()) {
             if (each["distance"].toDouble()>0) {
                 QMap<QString,QString> map;
@@ -998,7 +958,6 @@ Strava::prepareResponse(QByteArray* data)
         } else {
             addSamples(ride, QString("%1").arg(each["id"].toVariant().toULongLong()));
 
-            if (!each["gear_id"].isNull()) addEquipment(ride, each["gear_id"].toString());
             // laps?
             if (!each["laps"].isNull()) {
                 QJsonArray laps = each["laps"].toArray();
diff --git a/src/Cloud/Strava.h b/src/Cloud/Strava.h
index 85d10c10e..45ee2f57c 100644
--- a/src/Cloud/Strava.h
+++ b/src/Cloud/Strava.h
@@ -77,7 +77,6 @@ class Strava : public CloudService {
         QByteArray* prepareResponse(QByteArray* data);
 
         void addSamples(RideFile* ret, QString remoteid);
-        void addEquipment(RideFile* ret, QString gear_id);
         void fixLapSwim(RideFile* ret, QJsonArray laps);
         void fixSmartRecording(RideFile* ret);