Index: src/drive/about.h =================================================================== --- src/drive/about.h +++ src/drive/about.h @@ -226,7 +226,7 @@ static const QString AdditionalRoles; static const QString BackgroundImageLink; static const QString BytesUsed; - static const QString CanCreateTeamDrives; + static const QString CanCreateDrives; static const QString ColorRgb; static const QString DisplayName; static const QString DomainSharingPolicy; @@ -380,6 +380,11 @@ */ UserPtr user() const; + /** + * @brief Returns whether the user can create shared drives. + */ + bool canCreateDrives() const; + /** * @brief Constructs a new DriveAbout object from given JSON data * Index: src/drive/about.cpp =================================================================== --- src/drive/about.cpp +++ src/drive/about.cpp @@ -325,6 +325,7 @@ MaxUploadSizesList maxUploadSizes; QString permissionId; bool isCurrentAppInstalled; + bool canCreateDrives; UserPtr user; }; @@ -335,7 +336,8 @@ quotaBytesUsedAggregate(-1), largestChangeId(-1), remainingChangeIds(-1), - isCurrentAppInstalled(false) + isCurrentAppInstalled(false), + canCreateDrives(false) { } @@ -357,15 +359,16 @@ maxUploadSizes(other.maxUploadSizes), permissionId(other.permissionId), isCurrentAppInstalled(other.isCurrentAppInstalled), + canCreateDrives(other.canCreateDrives), user(other.user) { } const QString About::Fields::AdditionalRoleInfo = QStringLiteral("additionalRoleInfo"); const QString About::Fields::AdditionalRoles = QStringLiteral("additionalRoles"); const QString About::Fields::BackgroundImageLink = QStringLiteral("backgroundImageLink"); const QString About::Fields::BytesUsed = QStringLiteral("bytesUsed"); -const QString About::Fields::CanCreateTeamDrives = QStringLiteral("canCreateTeamDrives"); +const QString About::Fields::CanCreateDrives = QStringLiteral("canCreateDrives"); const QString About::Fields::ColorRgb = QStringLiteral("colorRgb"); const QString About::Fields::DisplayName = QStringLiteral("displayName"); const QString About::Fields::DomainSharingPolicy = QStringLiteral("domainSharingPolicy"); @@ -444,6 +447,7 @@ GAPI_COMPARE_CONTAINERS(maxUploadSizes) GAPI_COMPARE(permissionId) GAPI_COMPARE(isCurrentAppInstalled) + GAPI_COMPARE(canCreateDrives) GAPI_COMPARE_SHAREDPTRS(user) return true; } @@ -544,6 +548,11 @@ return d->user; } +bool About::canCreateDrives() const +{ + return d->canCreateDrives; +} + AboutPtr About::fromJSON(const QByteArray &jsonData) { QJsonDocument document = QJsonDocument::fromJson(jsonData); @@ -572,6 +581,7 @@ about->d->domainSharingPolicy = map.value(QStringLiteral("domainSharingPolicy")).toString(); about->d->permissionId = map.value(QStringLiteral("permissionId")).toString(); about->d->isCurrentAppInstalled = map.value(QStringLiteral("isCurrentAppInstalled")).toBool(); + about->d->canCreateDrives = map.value(QStringLiteral("canCreateDrives")).toBool(); const QVariantList importFormats = map.value(QStringLiteral("importFormats")).toList(); for (const QVariant &v : importFormats) { Index: src/drive/teamdrivecreatejob.h =================================================================== --- src/drive/teamdrivecreatejob.h +++ src/drive/teamdrivecreatejob.h @@ -32,7 +32,7 @@ namespace Drive { -class KGAPIDRIVE_EXPORT TeamdriveCreateJob : public KGAPI2::CreateJob +class KGAPIDRIVE_DEPRECATED_EXPORT TeamdriveCreateJob : public KGAPI2::CreateJob { Q_OBJECT Index: src/drive/teamdrivedeletejob.h =================================================================== --- src/drive/teamdrivedeletejob.h +++ src/drive/teamdrivedeletejob.h @@ -33,7 +33,7 @@ namespace Drive { -class KGAPIDRIVE_EXPORT TeamdriveDeleteJob : public KGAPI2::DeleteJob +class KGAPIDRIVE_DEPRECATED_EXPORT TeamdriveDeleteJob : public KGAPI2::DeleteJob { Q_OBJECT Index: src/drive/teamdrivefetchjob.h =================================================================== --- src/drive/teamdrivefetchjob.h +++ src/drive/teamdrivefetchjob.h @@ -34,7 +34,7 @@ namespace Drive { -class KGAPIDRIVE_EXPORT TeamdriveFetchJob : public KGAPI2::FetchJob +class KGAPIDRIVE_DEPRECATED_EXPORT TeamdriveFetchJob : public KGAPI2::FetchJob { Q_OBJECT Index: src/drive/teamdrivemodifyjob.h =================================================================== --- src/drive/teamdrivemodifyjob.h +++ src/drive/teamdrivemodifyjob.h @@ -33,7 +33,7 @@ namespace Drive { -class KGAPIDRIVE_EXPORT TeamdriveModifyJob : public KGAPI2::ModifyJob +class KGAPIDRIVE_DEPRECATED_EXPORT TeamdriveModifyJob : public KGAPI2::ModifyJob { Q_OBJECT