refactor(core,jni): remove the the bridges of configuration APIs

These APIs are useful when call them in C/C++, but they are hard to use with good performance for Java/Kotlin.

Author: WhiredPlanck

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

@@ -676,27 +676,6 @@ public static native boolean deployRimeConfigFile(
 
   public static native boolean selectRimeSchema(@NonNull String schemaId);
 
-  // configuration
-  public static native Boolean config_get_bool(String name, String key);
-
-  public static native boolean config_set_bool(String name, String key, boolean value);
-
-  public static native Integer config_get_int(String name, String key);
-
-  public static native boolean config_set_int(String name, String key, int value);
-
-  public static native Double config_get_double(String name, String key);
-
-  public static native boolean config_set_double(String name, String key, double value);
-
-  public static native String config_get_string(String name, String key);
-
-  public static native boolean config_set_string(String name, String key, String value);
-
-  public static native int config_list_size(String name, String key);
-
-  public static native List config_get_list(String name, String key);
-
   @Nullable
   public static native Map<String, Object> getRimeConfigMap(
       @NonNull String configId, @NonNull String key);
@@ -736,15 +715,6 @@ public static native Map<String, Object> getRimeConfigMap(
 
   public static native int get_keycode_by_name(String name);
 
-  // customize setting
-  public static native boolean customize_bool(String name, String key, boolean value);
-
-  public static native boolean customize_int(String name, String key, int value);
-
-  public static native boolean customize_double(String name, String key, double value);
-
-  public static native boolean customize_string(String name, String key, String value);
-
   @NonNull
   public static native SchemaListItem[] getAvailableRimeSchemaList();
 

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

@@ -7,76 +7,6 @@ static RimeLeversApi* get_levers() {
   return (RimeLeversApi*) (RimeFindModule("levers")->get_api());
 }
 
-extern "C"
-JNIEXPORT jboolean JNICALL
-Java_com_osfans_trime_core_Rime_customize_1bool(JNIEnv *env, jclass /* thiz */, jstring name, jstring key, jboolean value) {
-  RimeLeversApi* levers = get_levers();
-  const char* s = env->GetStringUTFChars(name, nullptr);
-  RimeCustomSettings* settings = levers->custom_settings_init(s, TAG);
-  Bool b = levers->load_settings(settings);
-  env->ReleaseStringUTFChars(name, s);
-  if (b) {
-    s = env->GetStringUTFChars(key, nullptr);
-    if (levers->customize_bool(settings, s, value)) levers->save_settings(settings);
-    env->ReleaseStringUTFChars(key, s);
-  }
-  levers->custom_settings_destroy(settings);
-  return b;
-}
-
-extern "C"
-JNIEXPORT jboolean JNICALL
-Java_com_osfans_trime_core_Rime_customize_1int(JNIEnv *env, jclass /* thiz */, jstring name, jstring key, jint value) {
-  RimeLeversApi* levers = get_levers();
-  const char* s = env->GetStringUTFChars(name, nullptr);
-  RimeCustomSettings* settings = levers->custom_settings_init(s, TAG);
-  Bool b = levers->load_settings(settings);
-  env->ReleaseStringUTFChars(name, s);
-  if (b) {
-    s = env->GetStringUTFChars(key, nullptr);
-    if (levers->customize_int(settings, s, value)) levers->save_settings(settings);
-    env->ReleaseStringUTFChars(key, s);
-  }
-  levers->custom_settings_destroy(settings);
-  return b;
-}
-
-extern "C"
-JNIEXPORT jboolean JNICALL
-Java_com_osfans_trime_core_Rime_customize_1double(JNIEnv *env, jclass /* thiz */, jstring name, jstring key, jdouble value) {
-  RimeLeversApi* levers = get_levers();
-  const char* s = env->GetStringUTFChars(name, nullptr);
-  RimeCustomSettings* settings = levers->custom_settings_init(s, TAG);
-  Bool b = levers->load_settings(settings);
-  env->ReleaseStringUTFChars(name, s);
-  if (b) {
-    s = env->GetStringUTFChars(key, nullptr);
-    if (levers->customize_double(settings, s, value)) levers->save_settings(settings);
-    env->ReleaseStringUTFChars(key, s);
-  }
-  levers->custom_settings_destroy(settings);
-  return b;
-}
-
-extern "C"
-JNIEXPORT jboolean JNICALL
-Java_com_osfans_trime_core_Rime_customize_1string(JNIEnv *env, jclass /* thiz */, jstring name, jstring key, jstring value) {
-  RimeLeversApi* levers = get_levers();
-  const char* s = env->GetStringUTFChars(name, nullptr);
-  RimeCustomSettings* settings = levers->custom_settings_init(s, TAG);
-  Bool b = levers->load_settings(settings);
-  env->ReleaseStringUTFChars(name, s);
-  if (b) {
-    s = env->GetStringUTFChars(key, nullptr);
-    const char* c_value = env->GetStringUTFChars(value, nullptr);
-    if (levers->customize_string(settings, s, c_value)) levers->save_settings(settings);
-    env->ReleaseStringUTFChars(key, s);
-    env->ReleaseStringUTFChars(value, c_value);
-  }
-  levers->custom_settings_destroy(settings);
-  return b;
-}
-
 extern "C"
 JNIEXPORT jobjectArray JNICALL
 Java_com_osfans_trime_core_Rime_getAvailableRimeSchemaList(JNIEnv *env, jclass /* thiz */) {

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

@@ -456,173 +456,6 @@ Java_com_osfans_trime_core_Rime_selectRimeSchema(JNIEnv *env, jclass /* thiz */,
     return Rime::Instance().selectSchema(schema);
 }
 
-// configuration
-extern "C"
-JNIEXPORT jobject JNICALL
-Java_com_osfans_trime_core_Rime_config_1get_1bool(JNIEnv *env, jclass /* thiz */, jstring name, jstring key) {
-    const char* s = env->GetStringUTFChars(name, nullptr);
-    RimeConfig config = {0};
-    Bool b = RimeConfigOpen(s, &config);
-    env->ReleaseStringUTFChars(name, s);
-    Bool value;
-    if (b) {
-        s = env->GetStringUTFChars(key, nullptr);
-        b = RimeConfigGetBool(&config, s, &value);
-        env->ReleaseStringUTFChars(key, s);
-    }
-    RimeConfigClose(&config);
-    if (!b) return nullptr;
-    jclass jc = env->FindClass("java/lang/Boolean");
-    jmethodID ctorID = env->GetMethodID(jc, "<init>", "(Z)V");
-    auto ret = env->NewObject(jc, ctorID, value);
-    env->DeleteLocalRef(jc);
-    return ret;
-}
-
-extern "C"
-JNIEXPORT jboolean JNICALL
-Java_com_osfans_trime_core_Rime_config_1set_1bool(JNIEnv *env, jclass /* thiz */, jstring name, jstring key, jboolean value) {
-    const char* s = env->GetStringUTFChars(name, nullptr);
-    RimeConfig config = {nullptr};
-    Bool b = RimeConfigOpen(s, &config);
-    env->ReleaseStringUTFChars(name, s);
-    if (b) {
-        s = env->GetStringUTFChars(key, nullptr);
-        b = RimeConfigSetBool(&config, s, value);
-        env->ReleaseStringUTFChars(key, s);
-    }
-    RimeConfigClose(&config);
-    return b;
-}
-
-extern "C"
-JNIEXPORT jobject JNICALL
-Java_com_osfans_trime_core_Rime_config_1get_1int(JNIEnv *env, jclass /* thiz */, jstring name, jstring key) {
-    const char* s = env->GetStringUTFChars(name, nullptr);
-    RimeConfig config = {nullptr};
-    Bool b = RimeConfigOpen(s, &config);
-    env->ReleaseStringUTFChars(name, s);
-    int value;
-    if (b) {
-        s = env->GetStringUTFChars(key, nullptr);
-        b = RimeConfigGetInt(&config, s, &value);
-        env->ReleaseStringUTFChars(key, s);
-    }
-    RimeConfigClose(&config);
-    if (!b) return nullptr;
-    jclass jc = env->FindClass("java/lang/Integer");
-    jmethodID ctorID = env->GetMethodID(jc, "<init>", "(I)V");
-    auto ret = env->NewObject(jc, ctorID, value);
-    env->DeleteLocalRef(jc);
-    return ret;
-}
-
-extern "C"
-JNIEXPORT jboolean JNICALL
-Java_com_osfans_trime_core_Rime_config_1set_1int(JNIEnv *env, jclass /* thiz */, jstring name, jstring key, jint value) {
-    const char* s = env->GetStringUTFChars(name, nullptr);
-    RimeConfig config = {nullptr};
-    Bool b = RimeConfigOpen(s, &config);
-    env->ReleaseStringUTFChars(name, s);
-    if (b) {
-        s = env->GetStringUTFChars(key, nullptr);
-        b = RimeConfigSetInt(&config, s, value);
-        env->ReleaseStringUTFChars(key, s);
-    }
-    RimeConfigClose(&config);
-    return b;
-}
-
-extern "C"
-JNIEXPORT jobject JNICALL
-Java_com_osfans_trime_core_Rime_config_1get_1double(JNIEnv *env, jclass /* thiz */, jstring name, jstring key) {
-    const char* s = env->GetStringUTFChars(name, nullptr);
-    RimeConfig config = {nullptr};
-    Bool b = RimeConfigOpen(s, &config);
-    env->ReleaseStringUTFChars(name, s);
-    double value;
-    if (b) {
-        s = env->GetStringUTFChars(key, nullptr);
-        b = RimeConfigGetDouble(&config, s, &value);
-        env->ReleaseStringUTFChars(key, s);
-    }
-    RimeConfigClose(&config);
-    if (!b) return nullptr;
-    jclass jc = env->FindClass("java/lang/Double");
-    jmethodID ctorID = env->GetMethodID(jc, "<init>", "(D)V");
-    auto ret = env->NewObject(jc, ctorID, value);
-    env->DeleteLocalRef(jc);
-    return ret;
-}
-
-extern "C"
-JNIEXPORT jboolean JNICALL
-Java_com_osfans_trime_core_Rime_config_1set_1double(JNIEnv *env, jclass /* thiz */, jstring name, jstring key, jdouble value) {
-    const char* s = env->GetStringUTFChars(name, nullptr);
-    RimeConfig config = {0};
-    Bool b = RimeConfigOpen(s, &config);
-    env->ReleaseStringUTFChars(name, s);
-    if (b) {
-        s = env->GetStringUTFChars(key, nullptr);
-        b = RimeConfigSetDouble(&config, s, value);
-        env->ReleaseStringUTFChars(key, s);
-    }
-    RimeConfigClose(&config);
-    return b;
-}
-
-extern "C"
-JNIEXPORT jstring JNICALL
-Java_com_osfans_trime_core_Rime_config_1get_1string(JNIEnv *env, jclass /* thiz */, jstring name, jstring key) {
-    const char* s = env->GetStringUTFChars(name, nullptr);
-    RimeConfig config = {nullptr};
-    Bool b = RimeConfigOpen(s, &config);
-    env->ReleaseStringUTFChars(name, s);
-    char value[MAX_BUFFER_LENGTH] = {0};
-    if (b) {
-        s = env->GetStringUTFChars(key, nullptr);
-        b = RimeConfigGetString(&config, s, value, MAX_BUFFER_LENGTH);
-        env->ReleaseStringUTFChars(key, s);
-    }
-    RimeConfigClose(&config);
-    return b ? env->NewStringUTF(value) : nullptr;
-}
-
-extern "C"
-JNIEXPORT jboolean JNICALL
-Java_com_osfans_trime_core_Rime_config_1set_1string(JNIEnv *env, jclass /* thiz */, jstring name, jstring key, jstring value) {
-    const char* s = env->GetStringUTFChars(name, nullptr);
-    RimeConfig config = {nullptr};
-    Bool b = RimeConfigOpen(s, &config);
-    env->ReleaseStringUTFChars(name, s);
-    if (b) {
-        s = env->GetStringUTFChars(key, nullptr);
-        const char* v = env->GetStringUTFChars(value, nullptr);
-        b = RimeConfigSetString(&config, s, v);
-        env->ReleaseStringUTFChars(key, s);
-        env->ReleaseStringUTFChars(key, v);
-    }
-    RimeConfigClose(&config);
-    return b;
-}
-
-extern "C"
-JNIEXPORT jint JNICALL
-Java_com_osfans_trime_core_Rime_config_1list_1size(JNIEnv *env, jclass /* thiz */, jstring name, jstring key) {
-    const char* s = env->GetStringUTFChars(name, nullptr);
-    RimeConfig config = {nullptr};
-    Bool b = RimeConfigOpen(s, &config);
-    env->ReleaseStringUTFChars(name, s);
-    int value = 0;
-    if (b) {
-        s = env->GetStringUTFChars(key, nullptr);
-        value = RimeConfigListSize(&config, s);
-        env->ReleaseStringUTFChars(key, s);
-    }
-    RimeConfigClose(&config);
-    return value;
-}
-
 //testing
 extern "C"
 JNIEXPORT jboolean JNICALL