Skip to content

Commit 67b6374

Browse files
committed
refactor(core,jni): remove redundant deployment APIs
We never deploy data with them.
1 parent 0b55a23 commit 67b6374

File tree

2 files changed

+0
-29
lines changed

2 files changed

+0
-29
lines changed

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

-5
Original file line numberDiff line numberDiff line change
@@ -635,11 +635,6 @@ public static boolean syncUserData() {
635635
public static native void startupRime(
636636
@NonNull String sharedDir, @NonNull String userDir, boolean fullCheck);
637637

638-
// deployment
639-
public static native void deployer_initialize(String shared_data_dir, String user_data_dir);
640-
641-
public static native boolean prebuild();
642-
643638
public static native void deployRime();
644639

645640
public static native boolean deploy_schema(String schema_file);

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

-24
Original file line numberDiff line numberDiff line change
@@ -154,18 +154,6 @@ JNI_OnLoad(JavaVM* jvm, void* reserved)
154154

155155
static jobject rimeConfigValueToJObject(JNIEnv *env, RimeConfig* config, const std::string &key);
156156

157-
void init_traits(JNIEnv *env, jstring shared_data_dir, jstring user_data_dir, void (*func)(RimeTraits *)) {
158-
RIME_STRUCT(RimeTraits, traits);
159-
const char* p_shared_data_dir = shared_data_dir == nullptr ? nullptr : env->GetStringUTFChars(shared_data_dir, nullptr);
160-
const char* p_user_data_dir = user_data_dir == nullptr ? nullptr : env->GetStringUTFChars(user_data_dir, nullptr);
161-
traits.shared_data_dir = p_shared_data_dir;
162-
traits.user_data_dir = p_user_data_dir;
163-
traits.app_name = "rime.trime";
164-
func(&traits);
165-
env->ReleaseStringUTFChars(shared_data_dir, p_shared_data_dir);
166-
env->ReleaseStringUTFChars(user_data_dir, p_user_data_dir);
167-
}
168-
169157
extern "C"
170158
JNIEXPORT void JNICALL
171159
Java_com_osfans_trime_core_Rime_startupRime(JNIEnv *env, jclass clazz, jstring shared_dir, jstring user_dir,
@@ -183,18 +171,6 @@ Java_com_osfans_trime_core_Rime_startupRime(JNIEnv *env, jclass clazz, jstring s
183171
}
184172

185173
// deployment
186-
extern "C"
187-
JNIEXPORT void JNICALL
188-
Java_com_osfans_trime_core_Rime_deployer_1initialize(JNIEnv *env, jclass /* thiz */, jstring shared_data_dir, jstring user_data_dir) {
189-
init_traits(env, shared_data_dir, user_data_dir, RimeDeployerInitialize);
190-
}
191-
192-
extern "C"
193-
JNIEXPORT jboolean JNICALL
194-
Java_com_osfans_trime_core_Rime_prebuild(JNIEnv *env, jclass /* thiz */) {
195-
return RimePrebuildAllSchemas();
196-
}
197-
198174
extern "C"
199175
JNIEXPORT void JNICALL
200176
Java_com_osfans_trime_core_Rime_deployRime(JNIEnv *env, jclass /* thiz */) {

0 commit comments

Comments
 (0)