Skip to content

Commit 3c816d8

Browse files
committed
refactor(api): wrap rime config/schema deploy api in C++ wrapper
1 parent 118b1e4 commit 3c816d8

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import com.osfans.trime.BuildConfig
88
import com.osfans.trime.data.base.DataManager
99
import com.osfans.trime.data.opencc.OpenCCDictManager
1010
import com.osfans.trime.util.appContext
11-
import com.osfans.trime.util.isAsciiPrintable
1211
import com.osfans.trime.util.isStorageAvailable
1312
import kotlinx.coroutines.channels.BufferOverflow
1413
import kotlinx.coroutines.flow.MutableSharedFlow

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

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,15 @@ class Rime {
7979
session_ = 0;
8080
}
8181

82+
bool deploySchema(std::string_view schemaFile) {
83+
return rime->deploy_schema(schemaFile.data());
84+
}
85+
86+
bool deployConfigFile(std::string_view configFile,
87+
std::string_view versionKey) {
88+
return rime->deploy_config_file(configFile.data(), versionKey.data());
89+
}
90+
8291
bool processKey(int keycode, int mask) {
8392
return rime->process_key(session_, keycode, mask);
8493
}
@@ -254,16 +263,16 @@ extern "C" JNIEXPORT jboolean JNICALL
254263
Java_com_osfans_trime_core_Rime_deployRimeSchemaFile(JNIEnv *env,
255264
jclass /* thiz */,
256265
jstring schema_file) {
257-
return rime_get_api()->deploy_schema(CString(env, schema_file));
266+
return Rime::Instance().deploySchema(*CString(env, schema_file));
258267
}
259268

260269
extern "C" JNIEXPORT jboolean JNICALL
261270
Java_com_osfans_trime_core_Rime_deployRimeConfigFile(JNIEnv *env,
262271
jclass /* thiz */,
263272
jstring file_name,
264273
jstring version_key) {
265-
return rime_get_api()->deploy_config_file(CString(env, file_name),
266-
CString(env, version_key));
274+
return Rime::Instance().deployConfigFile(*CString(env, file_name),
275+
*CString(env, version_key));
267276
}
268277

269278
extern "C" JNIEXPORT jboolean JNICALL

0 commit comments

Comments
 (0)