Skip to content

Commit

Permalink
fix indents
Browse files Browse the repository at this point in the history
  • Loading branch information
@thantthet
thantthet committed Mar 12, 2019
1 parent 356eaa7 commit 039c5d6
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 53 deletions.
20 changes: 10 additions & 10 deletions Java/jni/src/android_fopen.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,33 @@
#include <android/asset_manager.h>

static int android_read(void* cookie, char* buf, int size) {
return AAsset_read((AAsset*)cookie, buf, size);
return AAsset_read((AAsset*)cookie, buf, size);
}

static int android_write(void* cookie, const char* buf, int size) {
return EACCES; // can't provide write access to the apk
return EACCES; // can't provide write access to the apk
}

static fpos_t android_seek(void* cookie, fpos_t offset, int whence) {
return AAsset_seek((AAsset*)cookie, offset, whence);
return AAsset_seek((AAsset*)cookie, offset, whence);
}

static int android_close(void* cookie) {
AAsset_close((AAsset*)cookie);
return 0;
AAsset_close((AAsset*)cookie);
return 0;
}

// must be established by someone else...
AAssetManager* android_asset_manager;
void android_fopen_set_asset_manager(AAssetManager* manager) {
android_asset_manager = manager;
android_asset_manager = manager;
}

FILE* android_fopen(const char* fname, const char* mode) {
if(mode[0] == 'w') return NULL;
if(mode[0] == 'w') return NULL;

AAsset* asset = AAssetManager_open(android_asset_manager, fname, 0);
if(!asset) return NULL;
AAsset* asset = AAssetManager_open(android_asset_manager, fname, 0);
if(!asset) return NULL;

return funopen(asset, android_read, android_write, android_seek, android_close);
return funopen(asset, android_read, android_write, android_seek, android_close);
}
87 changes: 44 additions & 43 deletions Java/jni/src/com_keymagic_KeyMagicEngine.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ void wstring2string(std::wstring wstr, std::string &str)
void string2wstring(std::string str, std::wstring &wstr)
{
std::wstring_convert<std::codecvt_utf8<wchar_t>> myconv;
std::wstring u16str = myconv.from_bytes(str);
wstr.assign(u16str);
std::wstring u16str = myconv.from_bytes(str);
wstr.assign(u16str);
}

void Java_com_keymagic_KeyMagicEngine_initialise(JNIEnv *env, jobject obj)
Expand All @@ -34,34 +34,34 @@ void Java_com_keymagic_KeyMagicEngine_initialise(JNIEnv *env, jobject obj)
jboolean Java_com_keymagic_KeyMagicEngine_loadKeyboardFile__Ljava_lang_String_2(JNIEnv *env, jobject obj, jstring pathString)
{
KeyMagicEngine *engine = getHandle<KeyMagicEngine>(env, obj);
const char *str_path = env->GetStringUTFChars(pathString, 0);
bool success = engine->loadKeyboardFile(str_path);
env->ReleaseStringUTFChars(pathString, str_path);
return success;
const char *str_path = env->GetStringUTFChars(pathString, 0);
bool success = engine->loadKeyboardFile(str_path);
env->ReleaseStringUTFChars(pathString, str_path);
return success;
}

jboolean Java_com_keymagic_KeyMagicEngine_loadKeyboardFile__Landroid_content_res_AssetManager_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jobject assetManager, jstring filename)
{
// convert Java string to UTF-8
const char *utf8 = env->GetStringUTFChars(filename, NULL);
assert(NULL != utf8);
// convert Java string to UTF-8
const char *utf8 = env->GetStringUTFChars(filename, NULL);
assert(NULL != utf8);

__android_log_print(ANDROID_LOG_INFO, APPNAME, "opening asset file: %s.", utf8);
__android_log_print(ANDROID_LOG_INFO, APPNAME, "opening asset file: %s.", utf8);

// use asset manager to open asset by filename
AAssetManager* mgr = AAssetManager_fromJava(env, assetManager);
assert(NULL != mgr);
android_fopen_set_asset_manager(mgr);
// use asset manager to open asset by filename
AAssetManager* mgr = AAssetManager_fromJava(env, assetManager);
assert(NULL != mgr);
android_fopen_set_asset_manager(mgr);

FILE *hFile = android_fopen(utf8, "rb");
FILE *hFile = android_fopen(utf8, "rb");

env->ReleaseStringUTFChars(filename, utf8);
env->ReleaseStringUTFChars(filename, utf8);

__android_log_print(ANDROID_LOG_INFO, APPNAME, "opening keyboard from android file handle.");
__android_log_print(ANDROID_LOG_INFO, APPNAME, "opening keyboard from android file handle.");

KeyMagicEngine *engine = getHandle<KeyMagicEngine>(env, obj);
return engine->loadKeyboardFromFileHandle(hFile);
KeyMagicEngine *engine = getHandle<KeyMagicEngine>(env, obj);
return engine->loadKeyboardFromFileHandle(hFile);
}

jshort Java_com_keymagic_KeyMagicEngine_getKeyState(JNIEnv *env, jobject obj, jint keycode)
Expand Down Expand Up @@ -136,15 +136,16 @@ jlong Java_com_keymagic_KeyMagicEngine_getDifference(JNIEnv *env, jobject obj, j
if (difference_java != 0) {
jclass clazz = env->GetObjectClass(difference_java);
jmethodID mid =
env->GetMethodID (clazz,
"append",
"(Ljava/lang/String;)Ljava/lang/StringBuffer;");
if (mid != 0) {
std::string differenceUTF8;
wstring2string(difference, differenceUTF8);
jstring _jstring = env->NewStringUTF (differenceUTF8.c_str());
env->CallObjectMethod (difference_java, mid, _jstring);
}
env->GetMethodID (
clazz,
"append",
"(Ljava/lang/String;)Ljava/lang/StringBuffer;");
if (mid != 0) {
std::string differenceUTF8;
wstring2string(difference, differenceUTF8);
jstring _jstring = env->NewStringUTF (differenceUTF8.c_str());
env->CallObjectMethod (difference_java, mid, _jstring);
}
}
return deleteCount;
}
Expand All @@ -156,18 +157,18 @@ void Java_com_keymagic_KeyMagicEngine_setHistory(JNIEnv *env, jobject obj, jobje
TContextHistory history_native;

for (int i=0; i<stringCount; i++) {
jstring string = (jstring) env->GetObjectArrayElement(history_java, i);
const char *rawString = env->GetStringUTFChars(string, 0);
KeyMagicString contextString;
jstring string = (jstring) env->GetObjectArrayElement(history_java, i);
const char *rawString = env->GetStringUTFChars(string, 0);
KeyMagicString contextString;
string2wstring(rawString, contextString);

history_native.push_back(contextString);

env->ReleaseStringUTFChars(string, rawString);
}
env->ReleaseStringUTFChars(string, rawString);
}

engine->setHistory(history_native);
engine->setHistory(history_native);
}

jobjectArray Java_com_keymagic_KeyMagicEngine_getHistory(JNIEnv *env, jobject obj) {
Expand All @@ -176,12 +177,12 @@ jobjectArray Java_com_keymagic_KeyMagicEngine_getHistory(JNIEnv *env, jobject ob

jobjectArray history_java = (jobjectArray)env->NewObjectArray(history_native.size(), env->FindClass("java/lang/String"), env->NewStringUTF(""));

for(int i=0; i<history_native.size(); i++) {
std::string contextUTF8;
KeyMagicString context = history_native.at(i);
wstring2string(context, contextUTF8);
env->SetObjectArrayElement(history_java, i, env->NewStringUTF(contextUTF8.c_str()));
}
for(int i=0; i<history_native.size(); i++) {
std::string contextUTF8;
KeyMagicString context = history_native.at(i);
wstring2string(context, contextUTF8);
env->SetObjectArrayElement(history_java, i, env->NewStringUTF(contextUTF8.c_str()));
}

return history_java;
return history_java;
}

0 comments on commit 039c5d6

Please sign in to comment.