From 4215e6a22a87f756b3e2cbb1cca07a06718e1df2 Mon Sep 17 00:00:00 2001 From: Oscar Franco Date: Tue, 12 Mar 2024 05:26:27 +0100 Subject: [PATCH] Minor fixes --- cpp/bindings.cpp | 13 ++++++++----- cpp/bridge.cpp | 2 +- example/ios/Podfile.lock | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/cpp/bindings.cpp b/cpp/bindings.cpp index 62cd1069..70c29726 100644 --- a/cpp/bindings.cpp +++ b/cpp/bindings.cpp @@ -75,11 +75,14 @@ void install(jsi::Runtime &rt, throw std::runtime_error( "[OP SQLite] using SQLCipher encryption key is required"); } -#else - if (!encryptionKey.empty()) { - throw std::runtime_error("[OP SQLite] SQLCipher is not enabled, " - "encryption key is not allowed"); - } +// TODO(osp) find a way to display the yellow box from c++ +// #else +// if (!encryptionKey.empty()) { + +// RCTLogWarn(@"Your message") +// throw std::runtime_error("[OP SQLite] SQLCipher is not enabled, " +// "encryption key is not allowed"); +// } #endif if (!location.empty()) { diff --git a/cpp/bridge.cpp b/cpp/bridge.cpp index 3caf21c4..9a56341a 100644 --- a/cpp/bridge.cpp +++ b/cpp/bridge.cpp @@ -47,7 +47,7 @@ BridgeResult opsqlite_open(std::string const &dbName, std::string const &encryptionKey) { #else BridgeResult opsqlite_open(std::string const &dbName, - std::string const &lastPath) { + std::string const &last_path) { #endif std::string dbPath = get_db_path(dbName, last_path); diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index ff1fa9f1..28a23328 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1240,7 +1240,7 @@ SPEC CHECKSUMS: glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2 hermes-engine: 34df9d5034e90bd9bf1505e1ca198760373935af libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 - op-sqlite: 3f250045135ecb889ea09bb5a4d43e997eb94a58 + op-sqlite: 6e2f955abb2f307107edfb2f128c99089b03ef8d RCT-Folly: 7169b2b1c44399c76a47b5deaaba715eeeb476c0 RCTRequired: 6dda55e483f75d2b43781d8ad5bd7df276a50981 RCTTypeSafety: df0f2632f4e89938b9b9f6152b5e6c66fc6e969e