Skip to content

Commit 9548743

Browse files
committed
chore: migrate to rime_get_api
The deprecated librime 0.9 API function declarations will be move to a separeate header file rime_api_deprecated.h in rime/librime#877
1 parent 9e7ae97 commit 9548743

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ inline jobject rimeConfigListToJObject(JNIEnv *env, RimeConfig *config,
8686
auto obj =
8787
env->NewObject(GlobalRef->ArrayList, GlobalRef->ArrayListInit, size);
8888
int i = 0;
89-
while (RimeConfigNext(&iter)) {
89+
while (rime->config_next(&iter)) {
9090
auto e = JRef<>(env, rimeConfigValueToJObject(env, config, iter.path));
9191
env->CallVoidMethod(obj, GlobalRef->ArrayListAdd, i++, *e);
9292
}

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

+12-10
Original file line numberDiff line numberDiff line change
@@ -275,24 +275,25 @@ Java_com_osfans_trime_core_Rime_getRimeStatus(JNIEnv *env, jclass /* thiz */) {
275275
}
276276

277277
static bool is_save_option(const char *p) {
278+
auto rime = rime_get_api();
278279
bool is_save = false;
279280
std::string option_name(p);
280281
if (option_name.empty()) return is_save;
281282
RimeConfig config = {nullptr};
282-
bool b = RimeConfigOpen("default", &config);
283+
bool b = rime->config_open("default", &config);
283284
if (!b) return is_save;
284285
const char *key = "switcher/save_options";
285286
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));
289290
if (option_name == item) {
290291
is_save = true;
291292
break;
292293
}
293294
}
294-
RimeConfigEnd(&iter);
295-
RimeConfigClose(&config);
295+
rime->config_end(&iter);
296+
rime->config_close(&config);
296297
return is_save;
297298
}
298299

@@ -439,16 +440,17 @@ Java_com_osfans_trime_core_Rime_getRimeConfigMap(JNIEnv *env, jclass clazz,
439440
extern "C" JNIEXPORT jboolean JNICALL
440441
Java_com_osfans_trime_core_Rime_runRimeTask(JNIEnv *env, jclass /* thiz */,
441442
jstring task_name) {
443+
auto rime = rime_get_api();
442444
const char *s = env->GetStringUTFChars(task_name, nullptr);
443445
RimeConfig config = {nullptr};
444-
Bool b = RimeRunTask(s);
446+
Bool b = rime->run_task(s);
445447
env->ReleaseStringUTFChars(task_name, s);
446448
return b;
447449
}
448450
extern "C" JNIEXPORT jstring JNICALL
449451
Java_com_osfans_trime_core_Rime_getRimeSharedDataDir(JNIEnv *env,
450452
jclass /* thiz */) {
451-
return env->NewStringUTF(RimeGetSharedDataDir());
453+
return env->NewStringUTF(rime_get_api()->get_shared_data_dir());
452454
}
453455

454456
extern "C" JNIEXPORT jstring JNICALL
@@ -459,12 +461,12 @@ Java_com_osfans_trime_core_Rime_getRimeUserDataDir(JNIEnv *env,
459461

460462
extern "C" JNIEXPORT jstring JNICALL
461463
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());
463465
}
464466

465467
extern "C" JNIEXPORT jstring JNICALL
466468
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());
468470
}
469471

470472
extern "C" JNIEXPORT jstring JNICALL

0 commit comments

Comments
 (0)