diff --git a/windows/ReactNativeAsyncStorage/DBStorage.cpp b/windows/ReactNativeAsyncStorage/DBStorage.cpp index 84ee605d..ac18d8af 100644 --- a/windows/ReactNativeAsyncStorage/DBStorage.cpp +++ b/windows/ReactNativeAsyncStorage/DBStorage.cpp @@ -469,7 +469,7 @@ void DBStorage::DBTask::getAllKeys(sqlite3* db) { auto writer = winrt::MakeJSValueTreeWriter(); result.WriteTo(writer); std::vector callbackParams; - callbackParams.push_back(winrt::JSValueArray()); + callbackParams.push_back(nullptr); callbackParams.push_back(winrt::TakeJSValue(writer)); m_callback(callbackParams); } @@ -478,7 +478,7 @@ void DBStorage::DBTask::getAllKeys(sqlite3* db) { void DBStorage::DBTask::clear(sqlite3* db) { if (Exec(db, m_callback, u8"DELETE FROM AsyncLocalStorage")) { std::vector callbackParams; - callbackParams.push_back(winrt::JSValueArray()); + callbackParams.push_back(nullptr); m_callback(callbackParams); } } diff --git a/windows/ReactNativeAsyncStorage/RNCAsyncStorage.h b/windows/ReactNativeAsyncStorage/RNCAsyncStorage.h index 5e80a445..eba01af7 100644 --- a/windows/ReactNativeAsyncStorage/RNCAsyncStorage.h +++ b/windows/ReactNativeAsyncStorage/RNCAsyncStorage.h @@ -105,28 +105,28 @@ namespace winrt::ReactNativeAsyncStorage::implementation } REACT_METHOD(getAllKeys); - void getAllKeys(std::function&& callback) noexcept { + void getAllKeys(std::function&& callback) noexcept { dbStorage.AddTask(DBStorage::DBTask::Type::getAllKeys, [callback{ std::move(callback) }](std::vector const& callbackParams) { if (callbackParams.size() > 0) { - auto& errors = callbackParams[0].AsArray(); + auto& error = callbackParams[0]; if (callbackParams.size() > 1) { - callback(errors, callbackParams[1].AsArray()); + callback(error, callbackParams[1].AsArray()); } else { - callback(errors, {}); + callback(error, {}); } } }); } REACT_METHOD(clear); - void clear(std::function&& callback) noexcept { + void clear(std::function&& callback) noexcept { dbStorage.AddTask(DBStorage::DBTask::Type::clear, [callback{ std::move(callback) }](std::vector const& callbackParams) { if (callbackParams.size() > 0) { - auto& errors = callbackParams[0].AsArray(); - callback(errors); + auto& error = callbackParams[0]; + callback(error); } }); }