diff --git a/app/src/main/java/com/osfans/trime/core/Rime.kt b/app/src/main/java/com/osfans/trime/core/Rime.kt index 609e7a6375..e0d2ccc7e6 100644 --- a/app/src/main/java/com/osfans/trime/core/Rime.kt +++ b/app/src/main/java/com/osfans/trime/core/Rime.kt @@ -397,24 +397,6 @@ class Rime : @JvmStatic external fun forgetRimeCandidate(index: Int): Boolean - // module - @JvmStatic - external fun runRimeTask(taskName: String?): Boolean - - @JvmStatic - external fun getRimeSharedDataDir(): String? - - @JvmStatic - external fun getRimeUserDataDir(): String? - - @JvmStatic - external fun getRimeSyncDir(): String? - - @JvmStatic - external fun getRimeUserId(): String? - - // key_table - @JvmStatic external fun getAvailableRimeSchemaList(): Array @@ -424,12 +406,6 @@ class Rime : @JvmStatic external fun selectRimeSchemas(schemaIds: Array): Boolean - @JvmStatic - external fun getRimeStateLabel( - optionName: String, - state: Boolean, - ): String? - @JvmStatic external fun getRimeCandidates( startIndex: Int, diff --git a/app/src/main/jni/librime_jni/rime_jni.cc b/app/src/main/jni/librime_jni/rime_jni.cc index ebbbfe0c4b..91ee47ad81 100644 --- a/app/src/main/jni/librime_jni/rime_jni.cc +++ b/app/src/main/jni/librime_jni/rime_jni.cc @@ -120,10 +120,6 @@ class Rime { return rime->delete_candidate(session, index); } - std::string stateLabel(const std::string &optionName, bool state) { - return rime->get_state_label(session, optionName.c_str(), state); - } - using CandidateItem = std::pair; using CandidateList = std::vector; @@ -482,50 +478,6 @@ Java_com_osfans_trime_core_Rime_forgetRimeCandidate(JNIEnv *env, return Rime::Instance().forgetCandidate(index); } -extern "C" JNIEXPORT jboolean JNICALL -Java_com_osfans_trime_core_Rime_runRimeTask(JNIEnv *env, jclass /* thiz */, - jstring task_name) { - auto rime = rime_get_api(); - const char *s = env->GetStringUTFChars(task_name, nullptr); - RimeConfig config = {nullptr}; - Bool b = rime->run_task(s); - env->ReleaseStringUTFChars(task_name, s); - return b; -} -extern "C" JNIEXPORT jstring JNICALL -Java_com_osfans_trime_core_Rime_getRimeSharedDataDir(JNIEnv *env, - jclass /* thiz */) { - return env->NewStringUTF(rime_get_api()->get_shared_data_dir()); -} - -extern "C" JNIEXPORT jstring JNICALL -Java_com_osfans_trime_core_Rime_getRimeUserDataDir(JNIEnv *env, - jclass /* thiz */) { - return env->NewStringUTF(rime_get_api()->get_user_data_dir()); -} - -extern "C" JNIEXPORT jstring JNICALL -Java_com_osfans_trime_core_Rime_getRimeSyncDir(JNIEnv *env, jclass /* thiz */) { - return env->NewStringUTF(rime_get_api()->get_sync_dir()); -} - -extern "C" JNIEXPORT jstring JNICALL -Java_com_osfans_trime_core_Rime_getRimeUserId(JNIEnv *env, jclass /* thiz */) { - return env->NewStringUTF(rime_get_api()->get_user_id()); -} - -extern "C" JNIEXPORT jstring JNICALL -Java_com_osfans_trime_core_Rime_getRimeStateLabel(JNIEnv *env, - jclass /* thiz */, - jstring option_name, - jboolean state) { - if (!is_rime_running()) { - return nullptr; - } - return env->NewStringUTF( - Rime::Instance().stateLabel(CString(env, option_name), state).c_str()); -} - extern "C" JNIEXPORT jobjectArray JNICALL Java_com_osfans_trime_core_Rime_getRimeCandidates(JNIEnv *env, jclass clazz, jint start_index,