Skip to content

Commit 7d50a8c

Browse files
committed
refactor: remove unused delegated rime api
1 parent 1332be0 commit 7d50a8c

File tree

2 files changed

+0
-72
lines changed

2 files changed

+0
-72
lines changed

app/src/main/java/com/osfans/trime/core/Rime.kt

-24
Original file line numberDiff line numberDiff line change
@@ -397,24 +397,6 @@ class Rime :
397397
@JvmStatic
398398
external fun forgetRimeCandidate(index: Int): Boolean
399399

400-
// module
401-
@JvmStatic
402-
external fun runRimeTask(taskName: String?): Boolean
403-
404-
@JvmStatic
405-
external fun getRimeSharedDataDir(): String?
406-
407-
@JvmStatic
408-
external fun getRimeUserDataDir(): String?
409-
410-
@JvmStatic
411-
external fun getRimeSyncDir(): String?
412-
413-
@JvmStatic
414-
external fun getRimeUserId(): String?
415-
416-
// key_table
417-
418400
@JvmStatic
419401
external fun getAvailableRimeSchemaList(): Array<SchemaItem>
420402

@@ -424,12 +406,6 @@ class Rime :
424406
@JvmStatic
425407
external fun selectRimeSchemas(schemaIds: Array<String>): Boolean
426408

427-
@JvmStatic
428-
external fun getRimeStateLabel(
429-
optionName: String,
430-
state: Boolean,
431-
): String?
432-
433409
@JvmStatic
434410
external fun getRimeCandidates(
435411
startIndex: Int,

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

-48
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,6 @@ class Rime {
120120
return rime->delete_candidate(session, index);
121121
}
122122

123-
std::string stateLabel(const std::string &optionName, bool state) {
124-
return rime->get_state_label(session, optionName.c_str(), state);
125-
}
126-
127123
using CandidateItem = std::pair<std::string, std::string>;
128124
using CandidateList = std::vector<CandidateItem>;
129125

@@ -482,50 +478,6 @@ Java_com_osfans_trime_core_Rime_forgetRimeCandidate(JNIEnv *env,
482478
return Rime::Instance().forgetCandidate(index);
483479
}
484480

485-
extern "C" JNIEXPORT jboolean JNICALL
486-
Java_com_osfans_trime_core_Rime_runRimeTask(JNIEnv *env, jclass /* thiz */,
487-
jstring task_name) {
488-
auto rime = rime_get_api();
489-
const char *s = env->GetStringUTFChars(task_name, nullptr);
490-
RimeConfig config = {nullptr};
491-
Bool b = rime->run_task(s);
492-
env->ReleaseStringUTFChars(task_name, s);
493-
return b;
494-
}
495-
extern "C" JNIEXPORT jstring JNICALL
496-
Java_com_osfans_trime_core_Rime_getRimeSharedDataDir(JNIEnv *env,
497-
jclass /* thiz */) {
498-
return env->NewStringUTF(rime_get_api()->get_shared_data_dir());
499-
}
500-
501-
extern "C" JNIEXPORT jstring JNICALL
502-
Java_com_osfans_trime_core_Rime_getRimeUserDataDir(JNIEnv *env,
503-
jclass /* thiz */) {
504-
return env->NewStringUTF(rime_get_api()->get_user_data_dir());
505-
}
506-
507-
extern "C" JNIEXPORT jstring JNICALL
508-
Java_com_osfans_trime_core_Rime_getRimeSyncDir(JNIEnv *env, jclass /* thiz */) {
509-
return env->NewStringUTF(rime_get_api()->get_sync_dir());
510-
}
511-
512-
extern "C" JNIEXPORT jstring JNICALL
513-
Java_com_osfans_trime_core_Rime_getRimeUserId(JNIEnv *env, jclass /* thiz */) {
514-
return env->NewStringUTF(rime_get_api()->get_user_id());
515-
}
516-
517-
extern "C" JNIEXPORT jstring JNICALL
518-
Java_com_osfans_trime_core_Rime_getRimeStateLabel(JNIEnv *env,
519-
jclass /* thiz */,
520-
jstring option_name,
521-
jboolean state) {
522-
if (!is_rime_running()) {
523-
return nullptr;
524-
}
525-
return env->NewStringUTF(
526-
Rime::Instance().stateLabel(CString(env, option_name), state).c_str());
527-
}
528-
529481
extern "C" JNIEXPORT jobjectArray JNICALL
530482
Java_com_osfans_trime_core_Rime_getRimeCandidates(JNIEnv *env, jclass clazz,
531483
jint start_index,

0 commit comments

Comments
 (0)