From f54487c6cca38e1b30dad61160d5ed39524c1572 Mon Sep 17 00:00:00 2001 From: blagoev Date: Wed, 28 Jun 2017 15:02:28 +0300 Subject: [PATCH] Rename the progress function to better reflect purpose refactored registration code to remove the unneccesary lambda --- src/js_realm.hpp | 9 +++------ tests/js/session-tests.js | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/js_realm.hpp b/src/js_realm.hpp index 9bcf6448..7614667d 100644 --- a/src/js_realm.hpp +++ b/src/js_realm.hpp @@ -586,7 +586,7 @@ void RealmClass::wait_for_download_completion(ContextType ctx, FunctionType, auto realm = realm::Realm::get_shared_realm(config); if (auto sync_config = config.sync_config) { - static const String progressFuncName = "_onProgress"; + static const String progressFuncName = "_onDownloadProgress"; bool progressFuncDefined = false; if (!Value::is_boolean(ctx, sync_config_value) && !Value::is_undefined(ctx, sync_config_value)) { @@ -615,11 +615,8 @@ void RealmClass::wait_for_download_completion(ContextType ctx, FunctionType, if (user && user->state() != SyncUser::State::Error) { if (auto session = user->session_for_on_disk_path(config.path)) { if (progressFuncDefined) { - session->register_progress_notifier([=](uint64_t transferred_bytes, uint64_t transferrable_bytes) { - progressFunc(transferred_bytes, transferrable_bytes); - }, SyncSession::NotifierType::download, false); - } - + session->register_progress_notifier(std::move(progressFunc), SyncSession::NotifierType::download, false); + } session->wait_for_download_completion([=](std::error_code error_code) { realm->close(); //capture and keep realm instance for until here diff --git a/tests/js/session-tests.js b/tests/js/session-tests.js index bf1e753f..2a27b354 100644 --- a/tests/js/session-tests.js +++ b/tests/js/session-tests.js @@ -247,7 +247,7 @@ module.exports = { sync: { user, url: `realm://localhost:9080/~/${realmName}`, - _onProgress: (transferred, remaining) => { + _onDownloadProgress: (transferred, remaining) => { progressNotificationCalled = true }, }, @@ -279,7 +279,7 @@ module.exports = { let progressNotificationCalled = false; let config = { sync: { user, url: `realm://localhost:9080/~/${realmName}`, - _onProgress: (transferred, remaining) => { + _onDownloadProgress: (transferred, remaining) => { progressNotificationCalled = true }, },