@@ -275,24 +275,25 @@ Java_com_osfans_trime_core_Rime_getRimeStatus(JNIEnv *env, jclass /* thiz */) {
275
275
}
276
276
277
277
static bool is_save_option (const char *p) {
278
+ auto rime = rime_get_api ();
278
279
bool is_save = false ;
279
280
std::string option_name (p);
280
281
if (option_name.empty ()) return is_save;
281
282
RimeConfig config = {nullptr };
282
- bool b = RimeConfigOpen (" default" , &config);
283
+ bool b = rime-> config_open (" default" , &config);
283
284
if (!b) return is_save;
284
285
const char *key = " switcher/save_options" ;
285
286
RimeConfigIterator iter = {nullptr };
286
- RimeConfigBeginList (&iter, &config, key);
287
- while (RimeConfigNext (&iter)) {
288
- std::string item (RimeConfigGetCString (&config, iter.path ));
287
+ rime-> config_begin_list (&iter, &config, key);
288
+ while (rime-> config_next (&iter)) {
289
+ std::string item (rime-> config_get_cstring (&config, iter.path ));
289
290
if (option_name == item) {
290
291
is_save = true ;
291
292
break ;
292
293
}
293
294
}
294
- RimeConfigEnd (&iter);
295
- RimeConfigClose (&config);
295
+ rime-> config_end (&iter);
296
+ rime-> config_close (&config);
296
297
return is_save;
297
298
}
298
299
@@ -439,16 +440,17 @@ Java_com_osfans_trime_core_Rime_getRimeConfigMap(JNIEnv *env, jclass clazz,
439
440
extern " C" JNIEXPORT jboolean JNICALL
440
441
Java_com_osfans_trime_core_Rime_runRimeTask (JNIEnv *env, jclass /* thiz */ ,
441
442
jstring task_name) {
443
+ auto rime = rime_get_api ();
442
444
const char *s = env->GetStringUTFChars (task_name, nullptr );
443
445
RimeConfig config = {nullptr };
444
- Bool b = RimeRunTask (s);
446
+ Bool b = rime-> run_task (s);
445
447
env->ReleaseStringUTFChars (task_name, s);
446
448
return b;
447
449
}
448
450
extern " C" JNIEXPORT jstring JNICALL
449
451
Java_com_osfans_trime_core_Rime_getRimeSharedDataDir (JNIEnv *env,
450
452
jclass /* thiz */ ) {
451
- return env->NewStringUTF (RimeGetSharedDataDir ());
453
+ return env->NewStringUTF (rime_get_api ()-> get_shared_data_dir ());
452
454
}
453
455
454
456
extern " C" JNIEXPORT jstring JNICALL
@@ -459,12 +461,12 @@ Java_com_osfans_trime_core_Rime_getRimeUserDataDir(JNIEnv *env,
459
461
460
462
extern " C" JNIEXPORT jstring JNICALL
461
463
Java_com_osfans_trime_core_Rime_getRimeSyncDir (JNIEnv *env, jclass /* thiz */ ) {
462
- return env->NewStringUTF (RimeGetSyncDir ());
464
+ return env->NewStringUTF (rime_get_api ()-> get_sync_dir ());
463
465
}
464
466
465
467
extern " C" JNIEXPORT jstring JNICALL
466
468
Java_com_osfans_trime_core_Rime_getRimeUserId (JNIEnv *env, jclass /* thiz */ ) {
467
- return env->NewStringUTF (RimeGetUserId ());
469
+ return env->NewStringUTF (rime_get_api ()-> get_user_id ());
468
470
}
469
471
470
472
extern " C" JNIEXPORT jstring JNICALL
0 commit comments