Merge branch 'jb50799-google-people-api' into 'master'

[buteo-sync-plugins-social] Update Contacts plugin to use Google People API. JB#50799 See merge request mer-core/buteo-sync-plugins-social!86
sailfishos · Feb 22, 2021 · a0f8626 · a0f8626
2 parents b6f3b38 + a5309ea
commit a0f8626
Show file tree

Hide file tree

Showing 12 changed files with 3,083 additions and 2,531 deletions.
diff --git a/src/google/google-contacts/google-contacts.pri b/src/google/google-contacts/google-contacts.pri
@@ -4,14 +4,14 @@ QT += gui
 
 SOURCES += \
     $$PWD/googletwowaycontactsyncadaptor.cpp \
-    $$PWD/googlecontactstream.cpp \
-    $$PWD/googlecontactatom.cpp \
+    $$PWD/googlepeopleapi.cpp \
+    $$PWD/googlepeoplejson.cpp \
     $$PWD/googlecontactimagedownloader.cpp
 
 HEADERS += \
     $$PWD/googletwowaycontactsyncadaptor.h \
-    $$PWD/googlecontactstream.h \
-    $$PWD/googlecontactatom.h \
+    $$PWD/googlepeopleapi.h \
+    $$PWD/googlepeoplejson.h \
     $$PWD/googlecontactimagedownloader.h
 
 INCLUDEPATH += $$PWD

diff --git a/src/google/google-contacts/googlecontactatom.cpp b/src/google/google-contacts/googlecontactatom.cpp
diff --git a/src/google/google-contacts/googlecontactatom.h b/src/google/google-contacts/googlecontactatom.h
diff --git a/src/google/google-contacts/googlecontactimagedownloader.cpp b/src/google/google-contacts/googlecontactimagedownloader.cpp
@@ -45,7 +45,6 @@ QNetworkReply * GoogleContactImageDownloader::createReply(const QString &url,
 
     QString accessToken = metadata.value(IMAGE_DOWNLOADER_TOKEN_KEY).toString();
     QNetworkRequest request(url);
-    request.setRawHeader("GData-Version", "3.0");
     request.setRawHeader(QString(QLatin1String("Authorization")).toUtf8(),
                          QString(QLatin1String("Bearer ") + accessToken).toUtf8());
     return d->networkAccessManager->get(request);