kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-08-03 10:46:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Put more code in try{}

Browse Source
This commit is contained in:
Emmanuel Engelhart 2015-03-02 18:44:22 +01:00
parent 2474008e16
commit c1845e7bc2
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kiwix.c
View File

@ -160,7 +160,6 @@ JNIEXPORT jbyteArray JNICALL Java_org_kiwix_kiwixmobile_JNIKiwix_getContent(JNIE
setStringObjValue("", mimeTypeObj, env);
setIntObjValue(0, sizeObj, env);
jbyteArray data = env->NewByteArray(0);
bool isOK = false;
/* Retrieve the content */
if (reader != NULL) {
@ -171,19 +170,17 @@ JNIEXPORT jbyteArray JNICALL Java_org_kiwix_kiwixmobile_JNIKiwix_getContent(JNIE
pthread_mutex_lock(&readerLock);
try {
isOK = reader->getContentByUrl(cUrl, cData, cSize, cMimeType);
if (reader->getContentByUrl(cUrl, cData, cSize, cMimeType)) {
data = env->NewByteArray(cSize);
env->SetByteArrayRegion(data, 0, cSize, reinterpret_cast<const jbyte*>(cData.c_str()));
setStringObjValue(cMimeType, mimeTypeObj, env);
setIntObjValue(cSize, sizeObj, env);
}
} catch (exception &e) {
LOGI(e.what());
std::cerr << e.what() << std::endl;
}
pthread_mutex_unlock(&readerLock);
if (isOK) {
data = env->NewByteArray(cSize);
env->SetByteArrayRegion(data, 0, cSize, reinterpret_cast<const jbyte*>(cData.c_str()));
setStringObjValue(cMimeType, mimeTypeObj, env);
setIntObjValue(cSize, sizeObj, env);
}
}
return data;