@@ -20,7 +20,9 @@ inline jobject rimeContextToJObject(JNIEnv *env, const RimeContext &context) {
2020 env->NewObject (GlobalRef->RimeComposition , GlobalRef->RimeCompositionInit ,
2121 context.composition .length , context.composition .cursor_pos ,
2222 context.composition .sel_start , context.composition .sel_end ,
23- *JString (env, context.composition .preedit )));
23+ *JString (env, context.composition .preedit
24+ ? context.composition .preedit
25+ : " " )));
2426
2527 const auto &menu = context.menu ;
2628
@@ -50,7 +52,7 @@ inline jobject rimeContextToJObject(JNIEnv *env, const RimeContext &context) {
5052 env, env->NewObject (
5153 GlobalRef->CandidateListItem , GlobalRef->CandidateListItemInit ,
5254 *JString (env, candidate.comment ? candidate.comment : " " ),
53- *JString (env, candidate.text ? candidate. text : " " )));
55+ *JString (env, candidate.text )));
5456 env->SetObjectArrayElement (candidates, i, jcandidate);
5557 }
5658
@@ -62,7 +64,9 @@ inline jobject rimeContextToJObject(JNIEnv *env, const RimeContext &context) {
6264
6365 return env->NewObject (
6466 GlobalRef->RimeContext , GlobalRef->RimeContextInit , *jcomposition, *jmenu,
65- *JString (env, context.commit_text_preview ), *selectLabels);
67+ *JString (env,
68+ context.commit_text_preview ? context.commit_text_preview : " " ),
69+ *selectLabels);
6670}
6771
6872inline jobject rimeStatusToJObject (JNIEnv *env, const RimeStatus &status) {
0 commit comments