diff --git a/app/src/main/java/eu/faircode/email/CharsetHelper.java b/app/src/main/java/eu/faircode/email/CharsetHelper.java index e0d3fb6227..2823a569a3 100644 --- a/app/src/main/java/eu/faircode/email/CharsetHelper.java +++ b/app/src/main/java/eu/faircode/email/CharsetHelper.java @@ -43,7 +43,7 @@ class CharsetHelper { System.loadLibrary("fairemail"); } - private static native DetectResult jni_detect(byte[] octets); + private static native DetectResult jni_detect_charset(byte[] octets); static boolean isUTF8(String text) { // Get extended ASCII characters @@ -75,7 +75,7 @@ class CharsetHelper { } Log.i("compact_enc_det sample=" + sample.length); - DetectResult detected = jni_detect(sample); + DetectResult detected = jni_detect_charset(sample); if (TextUtils.isEmpty(detected.charset)) { Log.e("compact_enc_det result=" + detected); diff --git a/app/src/main/java/eu/faircode/email/TextHelper.java b/app/src/main/java/eu/faircode/email/TextHelper.java index 7e9ed51d7e..9eae316fd5 100644 --- a/app/src/main/java/eu/faircode/email/TextHelper.java +++ b/app/src/main/java/eu/faircode/email/TextHelper.java @@ -45,7 +45,7 @@ public class TextHelper { System.loadLibrary("fairemail"); } - private static native String jni_language(byte[] octets); + private static native String jni_detect_language(byte[] octets); static Locale detectLanguage(Context context, String text) { // Why not ML kit? https://developers.google.com/ml-kit/terms @@ -54,7 +54,7 @@ public class TextHelper { if (BuildConfig.DEBUG) { // https://github.com/google/cld3 - String lang = jni_language(text.getBytes()); + String lang = jni_detect_language(text.getBytes()); return Locale.forLanguageTag(lang); } diff --git a/app/src/main/jni/fairemail.cc b/app/src/main/jni/fairemail.cc index 89918230c4..0b3a38285d 100644 --- a/app/src/main/jni/fairemail.cc +++ b/app/src/main/jni/fairemail.cc @@ -21,7 +21,7 @@ void log_android(int prio, const char *fmt, ...) { } extern "C" JNIEXPORT jobject JNICALL -Java_eu_faircode_email_CharsetHelper_jni_1detect(JNIEnv *env, jclass type, jbyteArray _octets) { +Java_eu_faircode_email_CharsetHelper_jni_1detect_1charset(JNIEnv *env, jclass type, jbyteArray _octets) { int len = env->GetArrayLength(_octets); jbyte *octets = env->GetByteArrayElements(_octets, nullptr); @@ -60,7 +60,7 @@ Java_eu_faircode_email_CharsetHelper_jni_1detect(JNIEnv *env, jclass type, jbyte extern "C" JNIEXPORT jstring JNICALL -Java_eu_faircode_email_TextHelper_jni_1language(JNIEnv *env, jclass clazz, jbyteArray _octets) { +Java_eu_faircode_email_TextHelper_jni_1detect_1language(JNIEnv *env, jclass clazz, jbyteArray _octets) { int len = env->GetArrayLength(_octets); jbyte *octets = env->GetByteArrayElements(_octets, nullptr);