kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-18 11:55:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Android ZIM file size is displayed correctly for split ZIMs #329

Browse Source
This commit is contained in:
mhutti1 2016-09-27 15:28:01 +01:00
parent 1750fa90b1
commit 792452e4ef
8 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
kiwix.c
View File

@ -109,6 +109,23 @@ JNIEXPORT jstring JNICALL Java_org_kiwix_kiwixmobile_JNIKiwix_getId(JNIEnv *env,
return id;
}
JNIEXPORT jint JNICALL Java_org_kiwix_kiwixmobile_JNIKiwix_getFileSize(JNIEnv *env, jobject obj) {
jint size;
pthread_mutex_lock(&readerLock);
if (reader != NULL) {
try {
int cSize = reader->getFileSize();
size = c2jni(cSize);
} catch (exception &e) {
std::cerr << e.what() << std::endl;
}
}
pthread_mutex_unlock(&readerLock);
return size;
}
JNIEXPORT jstring JNICALL Java_org_kiwix_kiwixmobile_JNIKiwix_getCreator(JNIEnv *env, jobject obj) {
jstring creator;
@ -149,8 +166,8 @@ JNIEXPORT jstring JNICALL Java_org_kiwix_kiwixmobile_JNIKiwix_getFavicon(JNIEnv
pthread_mutex_lock(&readerLock);
if (reader != NULL) {
try {
std::string cContent;
std::string cMime;
std::string cContent;
std::string cMime;
reader->getFavicon(cContent, cMime);
favicon = c2jni(base64_encode(reinterpret_cast<const unsigned char*>(cContent.c_str()), cContent.length()), env);
} catch (exception &e) {
@ -248,10 +265,10 @@ JNIEXPORT jbyteArray JNICALL Java_org_kiwix_kiwixmobile_JNIKiwix_getContent(JNIE
pthread_mutex_lock(&readerLock);
try {
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);
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());
@ -273,7 +290,7 @@ JNIEXPORT jboolean JNICALL Java_org_kiwix_kiwixmobile_JNIKiwix_searchSuggestions
try {
if (reader != NULL) {
if (reader->searchSuggestionsSmart(cPrefix, cCount)) {
retVal = JNI_TRUE;
retVal = JNI_TRUE;
}
}
} catch (exception &e) {
@ -293,8 +310,8 @@ JNIEXPORT jboolean JNICALL Java_org_kiwix_kiwixmobile_JNIKiwix_getNextSuggestion
try {
if (reader != NULL) {
if (reader->getNextSuggestion(cTitle)) {
setStringObjValue(cTitle, titleObj, env);
retVal = JNI_TRUE;
setStringObjValue(cTitle, titleObj, env);
retVal = JNI_TRUE;
}
}
} catch (exception &e) {
@ -315,8 +332,8 @@ JNIEXPORT jboolean JNICALL Java_org_kiwix_kiwixmobile_JNIKiwix_getPageUrlFromTit
try {
if (reader != NULL) {
if (reader->getPageUrlFromTitle(cTitle, cUrl)) {
setStringObjValue(cUrl, urlObj, env);
retVal = JNI_TRUE;
setStringObjValue(cUrl, urlObj, env);
retVal = JNI_TRUE;
}
}
} catch (exception &e) {

BIN
libs/arm64-v8a/libkiwix.so
View File

Binary file not shown.

BIN
libs/armeabi/libkiwix.so
View File

Binary file not shown.

BIN
libs/mips/libkiwix.so
View File

Binary file not shown.

BIN
libs/x86/libkiwix.so
View File

Binary file not shown.

2
src/org/kiwix/kiwixmobile/JNIKiwix.java
View File

@ -55,7 +55,7 @@ public class JNIKiwix {
public native String getPublisher();
public native boolean getFileSize(JNIKiwixInt size);
public native int getFileSize();
public native int getArticleCount();

8
src/org/kiwix/kiwixmobile/ZimContentProvider.java
View File

@ -102,6 +102,14 @@ public class ZimContentProvider extends ContentProvider {
}
}
public static int getFileSize() {
if (jniKiwix == null || zimFileName == null) {
return 0;
} else {
return jniKiwix.getFileSize();
}
}
public static int getArticleCount() {
if (jniKiwix == null || zimFileName == null) {
return 0;

2
src/org/kiwix/kiwixmobile/utils/files/FileSearch.java
View File

@ -148,7 +148,7 @@ public class FileSearch {
b.title = ZimContentProvider.getZimFileTitle();
b.id = ZimContentProvider.getId();
b.file = new File(file);
b.size = String.valueOf(b.file.length() / 1024);
b.size = String.valueOf(ZimContentProvider.getFileSize());
b.favicon = ZimContentProvider.getFavicon();
b.creator = ZimContentProvider.getCreator();
b.publisher = ZimContentProvider.getPublisher();