refactor: make custom proto apis comply with the original style

Author: WhiredPlanck

app/src/main/jni/librime_jni/proto.cc

@@ -12,24 +12,28 @@
 
 using namespace rime;
 
-RIME_PROTO_OBJ rime_commit_proto(RimeSessionId session_id) {
+void rime_commit_proto(RimeSessionId session_id,
+                       RIME_PROTO_BUILDER *commit_builder) {
   an<Session> session(Service::instance().GetSession(session_id));
-  if (!session) return nullptr;
+  if (!session) return;
   auto env = GlobalRef->AttachEnv();
   const string &commit_text(session->commit_text());
-  RIME_PROTO_OBJ commit =
-      env->NewObject(GlobalRef->CommitProto, GlobalRef->CommitProtoInit,
-                     *JString(env, commit_text));
-  session->ResetCommitText();
-  return commit;
+  if (!commit_text.empty()) {
+    auto *commit = (jobject *)commit_builder;
+    *commit = env->NewObject(GlobalRef->CommitProto, GlobalRef->CommitProtoInit,
+                             *JString(env, commit_text));
+    session->ResetCommitText();
+  }
 }
 
-RIME_PROTO_OBJ rime_context_proto(RimeSessionId session_id) {
+void rime_context_proto(RimeSessionId session_id,
+                        RIME_PROTO_BUILDER *context_builder) {
   an<Session> session = Service::instance().GetSession(session_id);
-  if (!session) return nullptr;
+  if (!session) return;
   Context *ctx = session->context();
-  if (!ctx) return nullptr;
+  if (!ctx) return;
   auto env = GlobalRef->AttachEnv();
+  auto *context = (jobject *)context_builder;
   jobject composition = env->NewObject(GlobalRef->CompositionProto,
                                        GlobalRef->CompositionProtoDefault);
   if (ctx->IsComposing()) {
@@ -94,19 +98,22 @@ RIME_PROTO_OBJ rime_context_proto(RimeSessionId session_id) {
           *JRef<jobjectArray>(env, dest_labels));
     }
   }
-  return env->NewObject(GlobalRef->ContextProto, GlobalRef->ContextProtoInit,
-                        *JRef(env, composition), *JRef(env, menu),
-                        *JString(env, ctx->input()), ctx->caret_pos());
+  *context =
+      env->NewObject(GlobalRef->ContextProto, GlobalRef->ContextProtoInit,
+                     *JRef(env, composition), *JRef(env, menu),
+                     *JString(env, ctx->input()), ctx->caret_pos());
 }
 
-RIME_PROTO_OBJ rime_status_proto(RimeSessionId session_id) {
+void rime_status_proto(RimeSessionId session_id,
+                       RIME_PROTO_BUILDER *status_builder) {
   an<Session> session(Service::instance().GetSession(session_id));
-  if (!session) return nullptr;
+  if (!session) return;
   Schema *schema = session->schema();
   Context *ctx = session->context();
-  if (!schema || !ctx) return nullptr;
+  if (!schema || !ctx) return;
   auto env = GlobalRef->AttachEnv();
-  return env->NewObject(
+  auto *status = (jobject *)status_builder;
+  *status = env->NewObject(
       GlobalRef->StatusProto, GlobalRef->StatusProtoInit,
       *JString(env, schema->schema_id()), *JString(env, schema->schema_name()),
       Service::instance().disabled(), ctx->IsComposing(),

app/src/main/jni/librime_jni/proto.h

@@ -1,21 +1,23 @@
 #pragma once
 
-#include <jni.h>
 #include <rime_api.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 //! For passing pointer to jni object as opaque pointer through C API.
-#define RIME_PROTO_OBJ jobject
+#define RIME_PROTO_BUILDER void
 
 typedef struct rime_proto_api_t {
   int data_size;
 
-  RIME_PROTO_OBJ (*commit_proto)(RimeSessionId session_id);
-  RIME_PROTO_OBJ (*context_proto)(RimeSessionId session_id);
-  RIME_PROTO_OBJ (*status_proto)(RimeSessionId session_id);
+  void (*commit_proto)(RimeSessionId session_id,
+                       RIME_PROTO_BUILDER* commit_builder);
+  void (*context_proto)(RimeSessionId session_id,
+                        RIME_PROTO_BUILDER* context_builder);
+  void (*status_proto)(RimeSessionId session_id,
+                       RIME_PROTO_BUILDER* status_builder);
 } RimeProtoApi;
 
 #ifdef __cplusplus

app/src/main/jni/librime_jni/rime_jni.cc

@@ -77,11 +77,17 @@ class Rime {
 
   void clearComposition() { rime->clear_composition(session()); }
 
-  RIME_PROTO_OBJ commitProto() { return proto->commit_proto(session()); }
+  void commitProto(RIME_PROTO_BUILDER *builder) {
+    proto->commit_proto(session(), builder);
+  }
 
-  RIME_PROTO_OBJ contextProto() { return proto->context_proto(session()); }
+  void contextProto(RIME_PROTO_BUILDER *builder) {
+    proto->context_proto(session(), builder);
+  }
 
-  RIME_PROTO_OBJ statusProto() { return proto->status_proto(session()); }
+  void statusProto(RIME_PROTO_BUILDER *builder) {
+    proto->status_proto(session(), builder);
+  }
 
   void setOption(std::string_view key, bool value) {
     rime->set_option(session(), key.data(), value);
@@ -269,17 +275,23 @@ Java_com_osfans_trime_core_Rime_clearRimeComposition(JNIEnv *env,
 // output
 extern "C" JNIEXPORT jobject JNICALL
 Java_com_osfans_trime_core_Rime_getRimeCommit(JNIEnv *env, jclass /* thiz */) {
-  return Rime::Instance().commitProto();
+  jobject proto = nullptr;
+  Rime::Instance().commitProto(&proto);
+  return proto;
 }
 
 extern "C" JNIEXPORT jobject JNICALL
 Java_com_osfans_trime_core_Rime_getRimeContext(JNIEnv *env, jclass /* thiz */) {
-  return Rime::Instance().contextProto();
+  jobject proto = nullptr;
+  Rime::Instance().contextProto(&proto);
+  return proto;
 }
 
 extern "C" JNIEXPORT jobject JNICALL
 Java_com_osfans_trime_core_Rime_getRimeStatus(JNIEnv *env, jclass /* thiz */) {
-  return Rime::Instance().statusProto();
+  jobject proto = nullptr;
+  Rime::Instance().statusProto(&proto);
+  return proto;
 }
 
 // runtime options