feat: enable cloud sync

开启云同步功能 Log:
linuxdeepin · Mar 7, 2024 · 63a7516 · 63a7516
1 parent 78a7c65
commit 63a7516
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/calendar-client/src/dbus/doanetworkdbus.h b/calendar-client/src/dbus/doanetworkdbus.h
@@ -7,9 +7,9 @@
 
 #include <QDBusAbstractInterface>
 
-#define NETWORK_DBUS_INTEERFACENAME "com.deepin.daemon.Network"
-#define NETWORK_DBUS_NAME "com.deepin.daemon.Network"
-#define NETWORK_DBUS_PATH "/com/deepin/daemon/Network"
+#define NETWORK_DBUS_INTEERFACENAME "org.deepin.dde.Network1"
+#define NETWORK_DBUS_NAME "org.deepin.dde.Network1"
+#define NETWORK_DBUS_PATH "/org/deepin/dde/Network1"
 
 class DOANetWorkDBus : public QDBusAbstractInterface
 {

diff --git a/calendar-service/src/calendarDataManager/daccountmanagemodule.cpp b/calendar-service/src/calendarDataManager/daccountmanagemodule.cpp
@@ -37,9 +37,6 @@ DAccountManageModule::DAccountManageModule(QObject *parent)
                 &DAccountManageModule::slotSettingChange);
     }
     m_isSupportUid = m_syncFileManage->getSyncoperation()->hasAvailable();
-    if(Dtk::Core::DSysInfo::isCommunityEdition()){
-        m_isSupportUid = false;
-    }
     //新文件路径
     QString newDbPath = getDBPath();
     QString newDB(newDbPath + "/" + "accountmanager.db");

diff --git a/calendar-service/src/synchronization/syncfilemanage.cpp b/calendar-service/src/synchronization/syncfilemanage.cpp
@@ -128,10 +128,6 @@ bool SyncFileManage::syncDataDelete(const QString &filepath)
 DAccount::Ptr SyncFileManage::getuserInfo()
 {
     QVariantMap userInfoMap;
-    //如果为社区版本则返回空
-    if (Dtk::Core::DSysInfo::uosEditionType() == Dtk::Core::DSysInfo::UosCommunity) {
-        return nullptr;
-    }
 
     if (!m_syncoperation->optUserData(userInfoMap)) {
         qCInfo(ServiceLogger) << "can't get userinfo";

diff --git a/calendar-service/src/synchronization/syncoperation.cpp b/calendar-service/src/synchronization/syncoperation.cpp
@@ -4,6 +4,7 @@
 
 #include "syncoperation.h"
 #include "commondef.h"
+#include <QLoggingCategory>
 
 
 Syncoperation::Syncoperation(QObject *parent)
@@ -77,6 +78,7 @@ SyncoptResult Syncoperation::optUpload(const QString &key)
 
 SyncoptResult Syncoperation::optDownload(const QString &key, const QString &path)
 {
+    qCDebug(ServiceLogger) << "download" << key << path;
     SyncoptResult result;
     QDBusPendingReply<QString> reply = m_syncInter->Download(key, path);
     reply.waitForFinished();