Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Explore Instant Apps support #7649

Draft
wants to merge 3 commits into
base: releases
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ JNIEXPORT void JNICALL Java_io_realm_internal_objectstore_OsJavaNetworkTransport
jlong j_completion_block_ptr)
{
try {
auto& completion_block = *reinterpret_cast<std::function<void(const Response)>*>(j_completion_block_ptr);
util::UniqueFunction<void(const Response &)> &completion_block = *reinterpret_cast<util::UniqueFunction<void(const Response &)>*>(j_completion_block_ptr);

// Read response
static const JavaClass& response_class(JavaClassGlobalDef::network_transport_response_class());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ JNIEXPORT jbyte JNICALL Java_io_realm_internal_objectstore_OsSubscriptionSet_nat
return io_realm_internal_objectstore_OsSubscriptionSet_STATE_VALUE_COMPLETE;
case sync::SubscriptionSet::State::Error:
return io_realm_internal_objectstore_OsSubscriptionSet_STATE_VALUE_ERROR;
case sync::SubscriptionSet::State::Superceded:
case sync::SubscriptionSet::State::Superseded:
return io_realm_internal_objectstore_OsSubscriptionSet_STATE_VALUE_SUPERSEDED;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,13 @@ Java_io_realm_mongodb_FunctionsImpl_nativeCallFunction(JNIEnv* env, jclass , jlo
auto user = *reinterpret_cast<std::shared_ptr<SyncUser>*>(j_user_ptr);

std::function<void(util::Optional<Bson>, util::Optional<app::AppError>)> callback = JavaNetworkTransport::create_result_callback(env, j_callback, success_mapper);

auto handler = [callback](util::Optional<app::AppError> error, util::Optional<Bson> response) {
util::UniqueFunction<void(util::Optional<Bson>&&, util::Optional<AppError>)> handler = [callback](const util::Optional<Bson>& response, const util::Optional<AppError>& error) {
callback(response, error);
};

JStringAccessor name(env, j_name);
BsonArray args(JniBsonProtocol::parse_checked(env, j_args_json, Bson::Type::Array, "BSON argument must be an BsonArray"));
app->call_function(user, name, args, handler);
app->call_function(user, name, args, std::move(handler));
}
CATCH_STD()
}
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ JNIEXPORT jlong JNICALL Java_io_realm_mongodb_sync_SyncSession_nativeAddConnecti
throw std::runtime_error("An unexpected Error was thrown from Java. See LogCat");
}
};
uint64_t token = session->register_connection_change_callback(callback);
uint64_t token = session->register_connection_change_callback(std::move(callback));
return static_cast<jlong>(token);
}
CATCH_STD()
Expand Down
5 changes: 2 additions & 3 deletions realm/realm-library/src/main/cpp/java_network_transport.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ struct JavaNetworkTransport : public app::GenericNetworkTransport {
REALM_ASSERT_RELEASE_EX(m_send_request_method != nullptr, method_name, signature);
}

void send_request_to_server(const app::Request request, std::function<void(const app::Response)> completionBlock)
{
void send_request_to_server(Request &&request, util::UniqueFunction<void(const Response &)> &&completionBlock) override {
JNIEnv* env = JniUtils::get_env(true);

// Setup method
Expand Down Expand Up @@ -82,7 +81,7 @@ struct JavaNetworkTransport : public app::GenericNetworkTransport {
static_cast<jlong>(request.timeout_ms),
request_headers,
jbody,
new std::function<void(const app::Response)>(std::move(completionBlock))
new util::UniqueFunction<void(const Response &)>(std::move(completionBlock))
);
env->DeleteLocalRef(jmethod);
env->DeleteLocalRef(jurl);
Expand Down
2 changes: 1 addition & 1 deletion realm/realm-library/src/main/cpp/realm-core
Submodule realm-core updated 217 files