From b98d8f2a5eb023db3d22cb307cf8b61d5253dda0 Mon Sep 17 00:00:00 2001 From: Marko Kenttala Date: Thu, 5 Dec 2019 17:40:40 +0200 Subject: [PATCH] [buteo-sync-plugins-social] Support for multiple users. Fixes JB#47618. Removes hardcoded user home directory. --- rpm/sociald.spec | 175 +++++++++++++----- src/common.pri | 1 - src/common/buteosyncfw_p.h | 4 + .../dropboxbackupsyncadaptor.cpp | 2 +- .../facebookcalendarsyncadaptor.cpp | 4 +- .../facebookcontactsyncadaptor.cpp | 2 +- .../googlecalendarsyncadaptor.cpp | 10 +- .../googletwowaycontactsyncadaptor.cpp | 2 +- .../onedrivebackupsyncadaptor.cpp | 2 +- src/vk/vk-posts/vkpostsyncadaptor.cpp | 4 +- src/vk/vknetworkaccessmanager.cpp | 4 +- tests/tst_common.pri | 2 +- 12 files changed, 148 insertions(+), 64 deletions(-) diff --git a/rpm/sociald.spec b/rpm/sociald.spec index 56a3493..bddc9e7 100644 --- a/rpm/sociald.spec +++ b/rpm/sociald.spec @@ -20,6 +20,7 @@ BuildRequires: qt5-qttools-linguist BuildRequires: ssu-devel Requires: buteo-syncfw-qt5-msyncd Requires: systemd +Requires(pre): sailfish-setup Requires(post): systemd Obsoletes: sociald-facebook-notifications @@ -54,8 +55,12 @@ Provides calendar synchronisation with Facebook %config %{_sysconfdir}/buteo/profiles/sync/facebook.Calendars.xml %pre facebook-calendars -rm -f /home/nemo/.cache/msyncd/sync/client/facebook-calendars.xml || : -rm -f /home/nemo/.cache/msyncd/sync/facebook.Calendars.xml || : +USERS=$(getent group users | cut -d ":" -f 4 | tr "," "\n") +for user in $USERS; do + USERHOME=$(getent passwd ${user} | cut -d ":" -f 6) + rm -f ${USERHOME}/.cache/msyncd/sync/client/facebook-calendars.xml || : + rm -f ${USERHOME}/.cache/msyncd/sync/facebook.Calendars.xml || : +done %post facebook-calendars systemctl-user try-restart msyncd.service || : @@ -80,8 +85,12 @@ Provides contact synchronisation with Facebook %config %{_sysconfdir}/buteo/profiles/sync/facebook.Contacts.xml %pre facebook-contacts -rm -f /home/nemo/.cache/msyncd/sync/client/facebook-contacts.xml || : -rm -f /home/nemo/.cache/msyncd/sync/facebook.Contacts.xml || : +USERS=$(getent group users | cut -d ":" -f 4 | tr "," "\n") +for user in $USERS; do + USERHOME=$(getent passwd ${user} | cut -d ":" -f 6) + rm -f ${USERHOME}/.cache/msyncd/sync/client/facebook-contacts.xml || : + rm -f ${USERHOME}/.cache/msyncd/sync/facebook.Contacts.xml || : +done %post facebook-contacts systemctl-user try-restart msyncd.service || : @@ -103,8 +112,12 @@ Provides image synchronisation with Facebook %config %{_sysconfdir}/buteo/profiles/sync/facebook.Images.xml %pre facebook-images -rm -f /home/nemo/.cache/msyncd/sync/client/facebook-images.xml || : -rm -f /home/nemo/.cache/msyncd/sync/facebook.Images.xml || : +USERS=$(getent group users | cut -d ":" -f 4 | tr "," "\n") +for user in $USERS; do + USERHOME=$(getent passwd ${user} | cut -d ":" -f 6) + rm -f ${USERHOME}/.cache/msyncd/sync/client/facebook-images.xml || : + rm -f ${USERHOME}/.cache/msyncd/sync/facebook.Images.xml || : +done %post facebook-images systemctl-user try-restart msyncd.service || : @@ -127,8 +140,12 @@ Provides signon credentials refreshing with Facebook %config %{_sysconfdir}/buteo/profiles/sync/facebook.Signon.xml %pre facebook-signon -rm -f /home/nemo/.cache/msyncd/sync/client/facebook-signon.xml || : -rm -f /home/nemo/.cache/msyncd/sync/facebook.Signon.xml || : +USERS=$(getent group users | cut -d ":" -f 4 | tr "," "\n") +for user in $USERS; do + USERHOME=$(getent passwd ${user} | cut -d ":" -f 6) + rm -f ${USERHOME}/.cache/msyncd/sync/client/facebook-signon.xml || : + rm -f ${USERHOME}/.cache/msyncd/sync/facebook.Signon.xml || : +done %post facebook-signon systemctl-user try-restart msyncd.service || : @@ -153,8 +170,12 @@ Provides calendar synchronisation with Google %config %{_sysconfdir}/buteo/profiles/sync/google.Calendars.xml %pre google-calendars -rm -f /home/nemo/.cache/msyncd/sync/client/google-calendars.xml || : -rm -f /home/nemo/.cache/msyncd/sync/google.Calendars.xml || : +USERS=$(getent group users | cut -d ":" -f 4 | tr "," "\n") +for user in $USERS; do + USERHOME=$(getent passwd ${user} | cut -d ":" -f 6) + rm -f ${USERHOME}/.cache/msyncd/sync/client/google-calendars.xml || : + rm -f ${USERHOME}/.cache/msyncd/sync/google.Calendars.xml || : +done %post google-calendars systemctl-user try-restart msyncd.service || : @@ -179,8 +200,12 @@ Provides contact synchronisation with Google %config %{_sysconfdir}/buteo/profiles/sync/google.Contacts.xml %pre google-contacts -rm -f /home/nemo/.cache/msyncd/sync/client/google-contacts.xml || : -rm -f /home/nemo/.cache/msyncd/sync/google.Contacts.xml || : +USERS=$(getent group users | cut -d ":" -f 4 | tr "," "\n") +for user in $USERS; do + USERHOME=$(getent passwd ${user} | cut -d ":" -f 6) + rm -f ${USERHOME}/.cache/msyncd/sync/client/google-contacts.xml || : + rm -f ${USERHOME}/.cache/msyncd/sync/google.Contacts.xml || : +done %post google-contacts systemctl-user try-restart msyncd.service || : @@ -203,8 +228,12 @@ Provides signon credentials refreshing with Google %config %{_sysconfdir}/buteo/profiles/sync/google.Signon.xml %pre google-signon -rm -f /home/nemo/.cache/msyncd/sync/client/google-signon.xml || : -rm -f /home/nemo/.cache/msyncd/sync/google.Signon.xml || : +USERS=$(getent group users | cut -d ":" -f 4 | tr "," "\n") +for user in $USERS; do + USERHOME=$(getent passwd ${user} | cut -d ":" -f 6) + rm -f ${USERHOME}/.cache/msyncd/sync/client/google-signon.xml || : + rm -f ${USERHOME}/.cache/msyncd/sync/google.Signon.xml || : +done %post google-signon systemctl-user try-restart msyncd.service || : @@ -235,8 +264,12 @@ Provides notification synchronisation with Twitter %{_datadir}/translations/lipstick-jolla-home-twitter-notif_eng_en.qm %pre twitter-notifications -rm -f /home/nemo/.cache/msyncd/sync/client/twitter-notifications.xml || : -rm -f /home/nemo/.cache/msyncd/sync/twitter.Notifications.xml || : +USERS=$(getent group users | cut -d ":" -f 4 | tr "," "\n") +for user in $USERS; do + USERHOME=$(getent passwd ${user} | cut -d ":" -f 6) + rm -f ${USERHOME}/.cache/msyncd/sync/client/twitter-notifications.xml || : + rm -f ${USERHOME}/.cache/msyncd/sync/twitter.Notifications.xml || : +done %post twitter-notifications systemctl-user try-restart msyncd.service || : @@ -262,8 +295,12 @@ Provides post synchronisation with Twitter %{_datadir}/lipstick/notificationcategories/x-nemo.social.twitter.tweet.conf %pre twitter-posts -rm -f /home/nemo/.cache/msyncd/sync/client/twitter-posts.xml || : -rm -f /home/nemo/.cache/msyncd/sync/twitter.Posts.xml || : +USERS=$(getent group users | cut -d ":" -f 4 | tr "," "\n") +for user in $USERS; do + USERHOME=$(getent passwd ${user} | cut -d ":" -f 6) + rm -f ${USERHOME}/.cache/msyncd/sync/client/twitter-posts.xml || : + rm -f ${USERHOME}/.cache/msyncd/sync/twitter.Posts.xml || : +done %post twitter-posts systemctl-user try-restart msyncd.service || : @@ -286,8 +323,12 @@ Provides signon credentials refreshing with OneDrive %config %{_sysconfdir}/buteo/profiles/sync/onedrive.Signon.xml %pre onedrive-signon -rm -f /home/nemo/.cache/msyncd/sync/client/onedrive-signon.xml || : -rm -f /home/nemo/.cache/msyncd/sync/onedrive.Signon.xml || : +USERS=$(getent group users | cut -d ":" -f 4 | tr "," "\n") +for user in $USERS; do + USERHOME=$(getent passwd ${user} | cut -d ":" -f 6) + rm -f ${USERHOME}/.cache/msyncd/sync/client/onedrive-signon.xml || : + rm -f ${USERHOME}/.cache/msyncd/sync/onedrive.Signon.xml || : +done %post onedrive-signon systemctl-user try-restart msyncd.service || : @@ -314,8 +355,12 @@ Provides post synchronisation with VK %config %{_sysconfdir}/buteo/profiles/sync/vk.Posts.xml %pre vk-posts -rm -f /home/nemo/.cache/msyncd/sync/client/vk-posts.xml || : -rm -f /home/nemo/.cache/msyncd/sync/vk.Posts.xml || : +USERS=$(getent group users | cut -d ":" -f 4 | tr "," "\n") +for user in $USERS; do + USERHOME=$(getent passwd ${user} | cut -d ":" -f 6) + rm -f ${USERHOME}/.cache/msyncd/sync/client/vk-posts.xml || : + rm -f ${USERHOME}/.cache/msyncd/sync/vk.Posts.xml || : +done %post vk-posts systemctl-user restart msyncd.service || : @@ -336,8 +381,12 @@ Provides image synchronisation with Dropbox %config %{_sysconfdir}/buteo/profiles/sync/dropbox.Images.xml %pre dropbox-images -rm -f /home/nemo/.cache/msyncd/sync/client/dropbox-images.xml || : -rm -f /home/nemo/.cache/msyncd/sync/dropbox.Images.xml || : +USERS=$(getent group users | cut -d ":" -f 4 | tr "," "\n") +for user in $USERS; do + USERHOME=$(getent passwd ${user} | cut -d ":" -f 6) + rm -f ${USERHOME}/.cache/msyncd/sync/client/dropbox-images.xml || : + rm -f ${USERHOME}/.cache/msyncd/sync/dropbox.Images.xml || : +done %post dropbox-images systemctl-user try-restart msyncd.service || : @@ -358,8 +407,12 @@ Provides image synchronisation with OneDrive %config %{_sysconfdir}/buteo/profiles/sync/onedrive.Images.xml %pre onedrive-images -rm -f /home/nemo/.cache/msyncd/sync/client/onedrive-images.xml || : -rm -f /home/nemo/.cache/msyncd/sync/onedrive.Images.xml || : +USERS=$(getent group users | cut -d ":" -f 4 | tr "," "\n") +for user in $USERS; do + USERHOME=$(getent passwd ${user} | cut -d ":" -f 6) + rm -f ${USERHOME}/.cache/msyncd/sync/client/onedrive-images.xml || : + rm -f ${USERHOME}/.cache/msyncd/sync/onedrive.Images.xml || : +done %post onedrive-images systemctl-user try-restart msyncd.service || : @@ -383,8 +436,12 @@ Provides backup-blob synchronization for OneDrive %config %{_sysconfdir}/buteo/profiles/sync/onedrive.Backup.xml %pre onedrive-backup -rm -f /home/nemo/.cache/msyncd/sync/client/onedrive-backup.xml || : -rm -f /home/nemo/.cache/msyncd/sync/onedrive.Backup.xml || : +USERS=$(getent group users | cut -d ":" -f 4 | tr "," "\n") +for user in $USERS; do + USERHOME=$(getent passwd ${user} | cut -d ":" -f 6) + rm -f ${USERHOME}/.cache/msyncd/sync/client/onedrive-backup.xml || : + rm -f ${USERHOME}/.cache/msyncd/sync/onedrive.Backup.xml || : +done %post onedrive-backup systemctl-user try-restart msyncd.service || : @@ -408,8 +465,12 @@ Provides backup-blob synchronization for Dropbox %config %{_sysconfdir}/buteo/profiles/sync/dropbox.Backup.xml %pre dropbox-backup -rm -f /home/nemo/.cache/msyncd/sync/client/dropbox-backup.xml || : -rm -f /home/nemo/.cache/msyncd/sync/dropbox.Backup.xml || : +USERS=$(getent group users | cut -d ":" -f 4 | tr "," "\n") +for user in $USERS; do + USERHOME=$(getent passwd ${user} | cut -d ":" -f 6) + rm -f ${USERHOME}/.cache/msyncd/sync/client/dropbox-backup.xml || : + rm -f ${USERHOME}/.cache/msyncd/sync/dropbox.Backup.xml || : +done %post dropbox-backup systemctl-user try-restart msyncd.service || : @@ -435,8 +496,12 @@ Provides notification synchronisation with VK %{_datadir}/lipstick/notificationcategories/x-nemo.social.vk.notification.conf %pre vk-notifications -rm -f /home/nemo/.cache/msyncd/sync/client/vk-notifications.xml || : -rm -f /home/nemo/.cache/msyncd/sync/vk.Notifications.xml || : +USERS=$(getent group users | cut -d ":" -f 4 | tr "," "\n") +for user in $USERS; do + USERHOME=$(getent passwd ${user} | cut -d ":" -f 6) + rm -f ${USERHOME}/.cache/msyncd/sync/client/vk-notifications.xml || : + rm -f ${USERHOME}/.cache/msyncd/sync/vk.Notifications.xml || : +done %post vk-notifications systemctl-user restart msyncd.service || : @@ -460,8 +525,12 @@ Provides calendar synchronisation with VK %config %{_sysconfdir}/buteo/profiles/sync/vk.Calendars.xml %pre vk-calendars -rm -f /home/nemo/.cache/msyncd/sync/client/vk-calendars.xml || : -rm -f /home/nemo/.cache/msyncd/sync/vk.Calendars.xml || : +USERS=$(getent group users | cut -d ":" -f 4 | tr "," "\n") +for user in $USERS; do + USERHOME=$(getent passwd ${user} | cut -d ":" -f 6) + rm -f ${USERHOME}/.cache/msyncd/sync/client/vk-calendars.xml || : + rm -f ${USERHOME}/.cache/msyncd/sync/vk.Calendars.xml || : +done %post vk-calendars systemctl-user restart msyncd.service || : @@ -486,8 +555,12 @@ Provides contact synchronisation with VK %config %{_sysconfdir}/buteo/profiles/sync/vk.Contacts.xml %pre vk-contacts -rm -f /home/nemo/.cache/msyncd/sync/client/vk-contacts.xml || : -rm -f /home/nemo/.cache/msyncd/sync/vk.Contacts.xml || : +USERS=$(getent group users | cut -d ":" -f 4 | tr "," "\n") +for user in $USERS; do + USERHOME=$(getent passwd ${user} | cut -d ":" -f 6) + rm -f ${USERHOME}/.cache/msyncd/sync/client/vk-contacts.xml || : + rm -f ${USERHOME}/.cache/msyncd/sync/vk.Contacts.xml || : +done %post vk-contacts systemctl-user restart msyncd.service || : @@ -509,8 +582,12 @@ Provides image synchronisation with VK %config %{_sysconfdir}/buteo/profiles/sync/vk.Images.xml %pre vk-images -rm -f /home/nemo/.cache/msyncd/sync/client/vk-images.xml || : -rm -f /home/nemo/.cache/msyncd/sync/vk.Images.xml || : +USERS=$(getent group users | cut -d ":" -f 4 | tr "," "\n") +for user in $USERS; do + USERHOME=$(getent passwd ${user} | cut -d ":" -f 6) + rm -f ${USERHOME}/.cache/msyncd/sync/client/vk-images.xml || : + rm -f ${USERHOME}/.cache/msyncd/sync/vk.Images.xml || : +done %post vk-images systemctl-user restart msyncd.service || : @@ -550,15 +627,19 @@ Automatable tests for sociald make %{_smp_mflags} %pre -rm -f /home/nemo/.cache/msyncd/sync/client/sociald.xml || : -rm -f /home/nemo/.cache/msyncd/sync/sociald.facebook.Calendars.xml || : -rm -f /home/nemo/.cache/msyncd/sync/sociald.facebook.Contacts.xml || : -rm -f /home/nemo/.cache/msyncd/sync/sociald.facebook.Images.xml || : -rm -f /home/nemo/.cache/msyncd/sync/sociald.facebook.Notifications.xml || : -rm -f /home/nemo/.cache/msyncd/sync/sociald.twitter.Notifications.xml || : -rm -f /home/nemo/.cache/msyncd/sync/sociald.twitter.Posts.xml || : -rm -f /home/nemo/.cache/msyncd/sync/sociald.google.Calendars.xml || : -rm -f /home/nemo/.cache/msyncd/sync/sociald.google.Contacts.xml || : +USERS=$(getent group users | cut -d ":" -f 4 | tr "," "\n") +for user in $USERS; do + USERHOME=$(getent passwd ${user} | cut -d ":" -f 6) + rm -f ${USERHOME}/.cache/msyncd/sync/client/sociald.xml || : + rm -f ${USERHOME}/.cache/msyncd/sync/sociald.facebook.Calendars.xml || : + rm -f ${USERHOME}/.cache/msyncd/sync/sociald.facebook.Contacts.xml || : + rm -f ${USERHOME}/.cache/msyncd/sync/sociald.facebook.Images.xml || : + rm -f ${USERHOME}/.cache/msyncd/sync/sociald.facebook.Notifications.xml || : + rm -f ${USERHOME}/.cache/msyncd/sync/sociald.twitter.Notifications.xml || : + rm -f ${USERHOME}/.cache/msyncd/sync/sociald.twitter.Posts.xml || : + rm -f ${USERHOME}/.cache/msyncd/sync/sociald.google.Calendars.xml || : + rm -f ${USERHOME}/.cache/msyncd/sync/sociald.google.Contacts.xml || : +done %install rm -rf %{buildroot} diff --git a/src/common.pri b/src/common.pri index 63f2852..d41c8ea 100644 --- a/src/common.pri +++ b/src/common.pri @@ -22,7 +22,6 @@ QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF HEADERS += $$PWD/common/socialdnetworkaccessmanager_p.h !contains(DEFINES, 'SOCIALD_TEST_DEFINE') { SOURCES += $$PWD/common/socialdnetworkaccessmanager_p.cpp - DEFINES += 'PRIVILEGED_DATA_DIR=\'\"/home/nemo/.local/share/system/privileged/\"\'' } DEFINES += 'SYNC_DATABASE_DIR=\'\"Sync\"\'' diff --git a/src/common/buteosyncfw_p.h b/src/common/buteosyncfw_p.h index fe02d1c..5af9b22 100644 --- a/src/common/buteosyncfw_p.h +++ b/src/common/buteosyncfw_p.h @@ -37,4 +37,8 @@ #include #include +#ifndef SOCIALD_TEST_DEFINE +#define PRIVILEGED_DATA_DIR QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + QLatin1String("/.local/share/system/privileged") +#endif + #endif // SOCIALD_BUTEOSYNCFW_P_H diff --git a/src/dropbox/dropbox-backup/dropboxbackupsyncadaptor.cpp b/src/dropbox/dropbox-backup/dropboxbackupsyncadaptor.cpp index 0edda94..86ae2b3 100644 --- a/src/dropbox/dropbox-backup/dropboxbackupsyncadaptor.cpp +++ b/src/dropbox/dropbox-backup/dropboxbackupsyncadaptor.cpp @@ -92,7 +92,7 @@ void DropboxBackupSyncAdaptor::beginSync(int accountId, const QString &accessTok } if (backupRestoreOptions.localDirPath.isEmpty()) { - backupRestoreOptions.localDirPath = QString::fromLatin1("%1/Backups/").arg(QString::fromLatin1(PRIVILEGED_DATA_DIR)); + backupRestoreOptions.localDirPath = QString::fromLatin1("%1/Backups/").arg(PRIVILEGED_DATA_DIR); } // create local directory if it doesn't exist QDir localDir; diff --git a/src/facebook/facebook-calendars/facebookcalendarsyncadaptor.cpp b/src/facebook/facebook-calendars/facebookcalendarsyncadaptor.cpp index 8c8d995..6635370 100644 --- a/src/facebook/facebook-calendars/facebookcalendarsyncadaptor.cpp +++ b/src/facebook/facebook-calendars/facebookcalendarsyncadaptor.cpp @@ -62,7 +62,7 @@ namespace { bool ghostEventCleanupPerformed() { QString settingsFileName = QString::fromLatin1("%1/%2/fbcal.ini") - .arg(QString::fromLatin1(PRIVILEGED_DATA_DIR)) + .arg(PRIVILEGED_DATA_DIR) .arg(QString::fromLatin1(SYNC_DATABASE_DIR)); QSettings settingsFile(settingsFileName, QSettings::IniFormat); return settingsFile.value(QString::fromLatin1("cleaned"), QVariant::fromValue(false)).toBool(); @@ -71,7 +71,7 @@ namespace { void setGhostEventCleanupPerformed() { QString settingsFileName = QString::fromLatin1("%1/%2/fbcal.ini") - .arg(QString::fromLatin1(PRIVILEGED_DATA_DIR)) + .arg(PRIVILEGED_DATA_DIR) .arg(QString::fromLatin1(SYNC_DATABASE_DIR)); QSettings settingsFile(settingsFileName, QSettings::IniFormat); settingsFile.setValue(QString::fromLatin1("cleaned"), QVariant::fromValue(true)); diff --git a/src/facebook/facebook-contacts/facebookcontactsyncadaptor.cpp b/src/facebook/facebook-contacts/facebookcontactsyncadaptor.cpp index f7ed566..c460687 100644 --- a/src/facebook/facebook-contacts/facebookcontactsyncadaptor.cpp +++ b/src/facebook/facebook-contacts/facebookcontactsyncadaptor.cpp @@ -58,7 +58,7 @@ #define SOCIALD_FACEBOOK_CONTACTS_ID_PREFIX QLatin1String("facebook-contacts-") #define SOCIALD_FACEBOOK_CONTACTS_GROUPNAME QLatin1String("sociald-sync-facebook-contacts") #define SOCIALD_FACEBOOK_CONTACTS_SYNCTARGET QLatin1String("facebook") -#define SOCIALD_FACEBOOK_CONTACTS_AVATAR_FILENAME(fbFriendId, avatarType) QString("%1/%2/%3-%4.jpg").arg(QLatin1String(PRIVILEGED_DATA_DIR)).arg(SocialNetworkSyncAdaptor::dataTypeName(m_dataType)).arg(fbFriendId).arg(avatarType) +#define SOCIALD_FACEBOOK_CONTACTS_AVATAR_FILENAME(fbFriendId, avatarType) QString("%1/%2/%3-%4.jpg").arg(PRIVILEGED_DATA_DIR).arg(SocialNetworkSyncAdaptor::dataTypeName(m_dataType)).arg(fbFriendId).arg(avatarType) #define SOCIALD_FACEBOOK_CONTACTS_AVATAR_BATCHSIZE 20 static const char *WHICH_FIELDS = "name,first_name,middle_name,last_name,link,website,"\ diff --git a/src/google/google-calendars/googlecalendarsyncadaptor.cpp b/src/google/google-calendars/googlecalendarsyncadaptor.cpp index 145b79f..6787432 100644 --- a/src/google/google-calendars/googlecalendarsyncadaptor.cpp +++ b/src/google/google-calendars/googlecalendarsyncadaptor.cpp @@ -90,7 +90,7 @@ void traceDumpStr(const QString &str) bool ghostEventCleanupPerformed() { QString settingsFileName = QString::fromLatin1("%1/%2/gcal.ini") - .arg(QString::fromLatin1(PRIVILEGED_DATA_DIR)) + .arg(PRIVILEGED_DATA_DIR) .arg(QString::fromLatin1(SYNC_DATABASE_DIR)); QSettings settingsFile(settingsFileName, QSettings::IniFormat); return settingsFile.value(QString::fromLatin1("cleaned"), QVariant::fromValue(false)).toBool(); @@ -98,7 +98,7 @@ bool ghostEventCleanupPerformed() void setGhostEventCleanupPerformed() { QString settingsFileName = QString::fromLatin1("%1/%2/gcal.ini") - .arg(QString::fromLatin1(PRIVILEGED_DATA_DIR)) + .arg(PRIVILEGED_DATA_DIR) .arg(QString::fromLatin1(SYNC_DATABASE_DIR)); QSettings settingsFile(settingsFileName, QSettings::IniFormat); settingsFile.setValue(QString::fromLatin1("cleaned"), QVariant::fromValue(true)); @@ -899,7 +899,7 @@ bool localModificationIsReal(const QJsonObject &local, const QJsonObject &remote bool wasLastSyncSuccessful(int accountId, bool *needCleanSync) { QString settingsFileName = QString::fromLatin1("%1/%2/gcal.ini") - .arg(QString::fromLatin1(PRIVILEGED_DATA_DIR)) + .arg(PRIVILEGED_DATA_DIR) .arg(QString::fromLatin1(SYNC_DATABASE_DIR)); if (!QFile::exists(settingsFileName)) { SOCIALD_LOG_DEBUG("gcal.ini settings file does not exist, triggering clean sync"); @@ -925,7 +925,7 @@ bool wasLastSyncSuccessful(int accountId, bool *needCleanSync) void setLastSyncSuccessful(QList accountIds) { QString settingsFileName = QString::fromLatin1("%1/%2/gcal.ini") - .arg(QString::fromLatin1(PRIVILEGED_DATA_DIR)) + .arg(PRIVILEGED_DATA_DIR) .arg(QString::fromLatin1(SYNC_DATABASE_DIR)); QSettings settingsFile(settingsFileName, QSettings::IniFormat); Q_FOREACH(int accountId, accountIds) { @@ -938,7 +938,7 @@ void setLastSyncSuccessful(QList accountIds) void setLastSyncRequiresCleanSync(QList accountIds) { QString settingsFileName = QString::fromLatin1("%1/%2/gcal.ini") - .arg(QString::fromLatin1(PRIVILEGED_DATA_DIR)) + .arg(PRIVILEGED_DATA_DIR) .arg(QString::fromLatin1(SYNC_DATABASE_DIR)); QSettings settingsFile(settingsFileName, QSettings::IniFormat); Q_FOREACH(int accountId, accountIds) { diff --git a/src/google/google-contacts/googletwowaycontactsyncadaptor.cpp b/src/google/google-contacts/googletwowaycontactsyncadaptor.cpp index 3824c51..ffc22c3 100644 --- a/src/google/google-contacts/googletwowaycontactsyncadaptor.cpp +++ b/src/google/google-contacts/googletwowaycontactsyncadaptor.cpp @@ -92,7 +92,7 @@ void GoogleTwoWayContactSyncAdaptor::sync(const QString &dataTypeString, int acc { // check if we need to perform a complete clean sync QString settingsFileName = QString::fromLatin1("%1/%2/gcontacts.ini") - .arg(QString::fromLatin1(PRIVILEGED_DATA_DIR)) + .arg(PRIVILEGED_DATA_DIR) .arg(QString::fromLatin1(SYNC_DATABASE_DIR)); QSettings settingsFile(settingsFileName, QSettings::IniFormat); bool doneCleanSync = settingsFile.value(QString::fromLatin1("%1-cleansync").arg(accountId), QVariant::fromValue(false)).toBool(); diff --git a/src/onedrive/onedrive-backup/onedrivebackupsyncadaptor.cpp b/src/onedrive/onedrive-backup/onedrivebackupsyncadaptor.cpp index 33bb860..9d402b1 100644 --- a/src/onedrive/onedrive-backup/onedrivebackupsyncadaptor.cpp +++ b/src/onedrive/onedrive-backup/onedrivebackupsyncadaptor.cpp @@ -127,7 +127,7 @@ void OneDriveBackupSyncAdaptor::beginSync(int accountId, const QString &accessTo } if (backupRestoreOptions.localDirPath.isEmpty()) { - backupRestoreOptions.localDirPath = QString::fromLatin1("%1/Backups/").arg(QString::fromLatin1(PRIVILEGED_DATA_DIR)); + backupRestoreOptions.localDirPath = QString::fromLatin1("%1/Backups/").arg(PRIVILEGED_DATA_DIR); } // create local directory if it doesn't exist QDir localDir; diff --git a/src/vk/vk-posts/vkpostsyncadaptor.cpp b/src/vk/vk-posts/vkpostsyncadaptor.cpp index cfe81ee..f4a22be 100644 --- a/src/vk/vk-posts/vkpostsyncadaptor.cpp +++ b/src/vk/vk-posts/vkpostsyncadaptor.cpp @@ -484,7 +484,7 @@ QDateTime VKPostSyncAdaptor::lastSuccessfulSyncTime(int accountId) { QDateTime result; QString settingsFileName = QString::fromLatin1("%1/%2/vkposts.ini") - .arg(QString::fromLatin1(PRIVILEGED_DATA_DIR)) + .arg(PRIVILEGED_DATA_DIR) .arg(QString::fromLatin1(SYNC_DATABASE_DIR)); QSettings settingsFile(settingsFileName, QSettings::IniFormat); uint timestamp = settingsFile.value(QString::fromLatin1("%1-last-successful-sync-time").arg(accountId)).toUInt(); @@ -498,7 +498,7 @@ void VKPostSyncAdaptor::setLastSuccessfulSyncTime(int accountId) { QDateTime currentTime = QDateTime::currentDateTime().toUTC(); QString settingsFileName = QString::fromLatin1("%1/%2/vkposts.ini") - .arg(QString::fromLatin1(PRIVILEGED_DATA_DIR)) + .arg(PRIVILEGED_DATA_DIR) .arg(QString::fromLatin1(SYNC_DATABASE_DIR)); QSettings settingsFile(settingsFileName, QSettings::IniFormat); settingsFile.setValue(QString::fromLatin1("%1-last-successful-sync-time").arg(accountId), diff --git a/src/vk/vknetworkaccessmanager.cpp b/src/vk/vknetworkaccessmanager.cpp index 29484ae..861ad7e 100644 --- a/src/vk/vknetworkaccessmanager.cpp +++ b/src/vk/vknetworkaccessmanager.cpp @@ -38,7 +38,7 @@ namespace { bool touchTimestampFile() { static const QString timestampFileName = QString::fromLatin1("%1/%2/vktimestamp") - .arg(QString::fromLatin1(PRIVILEGED_DATA_DIR)) + .arg(PRIVILEGED_DATA_DIR) .arg(QString::fromLatin1(SYNC_DATABASE_DIR)); QByteArray tsfnba = timestampFileName.toUtf8(); @@ -59,7 +59,7 @@ namespace { qint64 readTimestampFile() { static const QString timestampFileName = QString::fromLatin1("%1/%2/vktimestamp") - .arg(QString::fromLatin1(PRIVILEGED_DATA_DIR)) + .arg(PRIVILEGED_DATA_DIR) .arg(QString::fromLatin1(SYNC_DATABASE_DIR)); QByteArray tsfnba = timestampFileName.toUtf8(); diff --git a/tests/tst_common.pri b/tests/tst_common.pri index 3cce616..1c21945 100644 --- a/tests/tst_common.pri +++ b/tests/tst_common.pri @@ -1,5 +1,5 @@ DEFINES += SOCIALD_TEST_DEFINE -DEFINES += 'PRIVILEGED_DATA_DIR=\'\"/tmp/\"\'' +DEFINES += 'PRIVILEGED_DATA_DIR=\'\"/tmp\"\'' DEFINES += SOCIALD_USE_QTPIM include($$PWD/../src/common.pri)