refactor(core,jni,ui): reform the native method of selecting schemas

Author: WhiredPlanck

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

@@ -554,7 +554,7 @@ public static String getSchemaName() {
   public static boolean selectSchema(String schemaId) {
     Timber.d("Selecting schemaId=%s", schemaId);
     overWriteSchema(schemaId);
-    boolean b = select_schema(schemaId);
+    boolean b = selectRimeSchema(schemaId);
     getContexts();
     return b;
   }
@@ -565,8 +565,8 @@ public static void applySchemaChange() {
     // 实测直接select_schema(schema_id)方案没有重新载入，切换到不存在的方案，再切回去（会产生1秒的额外耗时）.需要找到更好的方法
     // 不发生覆盖则不生效
     if (overWriteSchema(schema_id)) {
-      select_schema("nill");
-      select_schema(schema_id);
+      selectRimeSchema("nill");
+      selectRimeSchema(schema_id);
     }
     getContexts();
   }
@@ -769,7 +769,7 @@ public static boolean deploy_config_file(String name, boolean skipIfExists) {
   @NonNull
   public static native String getCurrentRimeSchema();
 
-  public static native boolean select_schema(String schema_id);
+  public static native boolean selectRimeSchema(@NonNull String schemaId);
 
   // configuration
   public static native Boolean config_get_bool(String name, String key);
@@ -852,7 +852,7 @@ public static native Map<String, Object> getRimeConfigMap(
   @NonNull
   public static native SchemaListItem[] getSelectedRimeSchemaList();
 
-  public static native boolean select_schemas(String[] schema_id_list);
+  public static native boolean selectRimeSchemas(@NonNull String[] schemaIds);
 
   // opencc
   public static native String get_opencc_version();

app/src/main/java/com/osfans/trime/ui/main/Pickers.kt

@@ -85,7 +85,7 @@ suspend fun Context.schemaPicker(
         }
         postiveDispatcher = Dispatchers.Default
         onOKButton {
-            Rime.select_schemas(
+            Rime.selectRimeSchemas(
                 items.filterIndexed { index, _ ->
                     checkedItems[index]
                 }.map { it.toString() }.toTypedArray()

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

@@ -107,30 +107,22 @@ Java_com_osfans_trime_core_Rime_getSelectedRimeSchemaList(JNIEnv *env, jclass /*
 
 extern "C"
 JNIEXPORT jboolean JNICALL
-Java_com_osfans_trime_core_Rime_select_1schemas(JNIEnv *env, jclass /* thiz */, jobjectArray stringArray) {
-  if (stringArray == nullptr) return false;
-  int count = env->GetArrayLength(stringArray);
-  if (count == 0) return false;
-  const char** schema_id_list = new const char*[count];
-  for (int i = 0; i < count; i++) {
-    auto string = (jstring) env->GetObjectArrayElement(stringArray, i);
-    const char *rawString = env->GetStringUTFChars(string, nullptr);
-    schema_id_list[i] = rawString;
+Java_com_osfans_trime_core_Rime_selectRimeSchemas(JNIEnv *env, jclass /* thiz */, jobjectArray array) {
+  int schemaIdsLength = env->GetArrayLength(array);
+  const char* entries[schemaIdsLength];
+  for (int i = 0; i < schemaIdsLength; i++) {
+    auto string = JRef<jstring>(env, env->GetObjectArrayElement(array, i));
+    entries[i] = env->GetStringUTFChars(string, nullptr);
   }
-  RimeLeversApi* api_ = get_levers();
-  RimeSwitcherSettings* settings_ = api_->switcher_settings_init();
-  auto *custom_settings_ = (RimeCustomSettings *) settings_;
-  Bool b = api_->load_settings(custom_settings_);
-  if (b) {
-    b = api_->select_schemas(settings_, schema_id_list, count);
-    api_->save_settings(custom_settings_);
-    api_->custom_settings_destroy(custom_settings_);
-  }
-  for (int i = 0; i < count; i++) {
-    auto string = (jstring) env->GetObjectArrayElement(stringArray, i);
-    const char *rawString = schema_id_list[i];
-    env->ReleaseStringUTFChars(string, rawString);
+  auto levers = get_levers();
+  auto switcher = levers->switcher_settings_init();
+  levers->load_settings((RimeCustomSettings *) switcher);
+  levers->select_schemas(switcher, entries, schemaIdsLength);
+  levers->save_settings((RimeCustomSettings *) switcher);
+  levers->custom_settings_destroy((RimeCustomSettings *) switcher);
+  for (int i = 0; i < schemaIdsLength; i++) {
+      auto string = JRef<jstring>(env, env->GetObjectArrayElement(array, i));
+      env->ReleaseStringUTFChars(string, entries[i]);
   }
-  delete[] schema_id_list;
-  return b;
+  return true;
 }

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

@@ -409,20 +409,17 @@ Java_com_osfans_trime_core_Rime_getCurrentRimeSchema(JNIEnv *env, jclass /* thiz
 
 extern "C"
 JNIEXPORT jboolean JNICALL
-Java_com_osfans_trime_core_Rime_select_1schema(JNIEnv *env, jclass /* thiz */, jstring schema_id) {
-    const char* s = schema_id == nullptr ? nullptr : env->GetStringUTFChars(schema_id, nullptr);
-    RimeConfig config = {nullptr};
-    Bool b = RimeUserConfigOpen("user", &config);
-    if (b) {
-        b = RimeConfigSetString(&config, "var/previously_selected_schema", s);
-        std::string str(s);
-        str = "var/schema_access_time/" + str;
-        b = RimeConfigSetInt(&config, str.c_str(), time(nullptr));
+Java_com_osfans_trime_core_Rime_selectRimeSchema(JNIEnv *env, jclass /* thiz */, jstring schema_id) {
+    auto rime = rime_get_api();
+    RimeConfig user = {nullptr};
+    auto schema = CString(env, schema_id);
+    if (rime->user_config_open("user", &user)) {
+        rime->config_set_string(&user, "var/previously_selected_schema", schema);
+        std::string key = "var/schema_access_time/" + std::string (schema);
+        rime->config_set_int(&user, key.c_str(), time(nullptr));
+        rime->config_close(&user);
     }
-    RimeConfigClose(&config);
-    bool value = RimeSelectSchema(activated_session_id, s);
-    env->ReleaseStringUTFChars(schema_id, s);
-    return value;
+    return rime->select_schema(activated_session_id, schema);
 }
 
 // configuration