diff --git a/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.h b/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.h --- a/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.h +++ b/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.h @@ -49,6 +49,7 @@ // Backup methods static void captureBackupLogs(); + static void triggerBackupFileUpload(); }; } // namespace comm diff --git a/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.cpp b/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.cpp --- a/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.cpp +++ b/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.cpp @@ -8,6 +8,7 @@ #include "SQLiteUtils.h" #include "../Tools/ServicesUtils.h" +#include "lib.rs.h" #include @@ -221,4 +222,11 @@ "logID", std::to_string(std::stoi(logID) + 1)); } +void DatabaseManager::triggerBackupFileUpload() { + if (!ServicesUtils::fullBackupSupport) { + return; + } + ::triggerBackupFileUpload(); +} + } // namespace comm diff --git a/native/cpp/CommonCpp/DatabaseManagers/DatabaseQueryExecutor.h b/native/cpp/CommonCpp/DatabaseManagers/DatabaseQueryExecutor.h --- a/native/cpp/CommonCpp/DatabaseManagers/DatabaseQueryExecutor.h +++ b/native/cpp/CommonCpp/DatabaseManagers/DatabaseQueryExecutor.h @@ -201,7 +201,6 @@ #ifndef EMSCRIPTEN virtual void createMainCompaction(std::string backupID) const = 0; - virtual void triggerBackupFileUpload() const = 0; #endif }; diff --git a/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.h b/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.h --- a/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.h +++ b/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.h @@ -217,7 +217,6 @@ std::string &backupDataKey, std::string &backupLogDataKey); void createMainCompaction(std::string backupID) const override; - void triggerBackupFileUpload() const override; #endif }; diff --git a/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp b/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp --- a/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp +++ b/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp @@ -1784,13 +1784,6 @@ } } -void SQLiteQueryExecutor::triggerBackupFileUpload() const { - if (!ServicesUtils::fullBackupSupport) { - return; - } - ::triggerBackupFileUpload(); -} - #endif void SQLiteQueryExecutor::copyTablesDataUsingAttach( diff --git a/native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp b/native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp --- a/native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp +++ b/native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp @@ -468,7 +468,7 @@ } if (!error.size()) { - DatabaseManager::getQueryExecutor().triggerBackupFileUpload(); + DatabaseManager::triggerBackupFileUpload(); } this->jsInvoker_->invokeAsync([=]() { diff --git a/native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/DataStores/BaseDataStore.h b/native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/DataStores/BaseDataStore.h --- a/native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/DataStores/BaseDataStore.h +++ b/native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/DataStores/BaseDataStore.h @@ -62,7 +62,7 @@ throw std::runtime_error(error); } - DatabaseManager::getQueryExecutor().triggerBackupFileUpload(); + DatabaseManager::triggerBackupFileUpload(); }); } };