diff options
| author | Matt Holgate <matt@emobix.co.uk> | 2014-07-02 18:05:43 +0100 |
|---|---|---|
| committer | Matt Holgate <matt@emobix.co.uk> | 2014-07-02 18:05:43 +0100 |
| commit | fe01358a4e3cf8e8c1d625937f89ddb9c1a7d8dc (patch) | |
| tree | 03b31b2a834e695b717f70945bae0c8603fa53cd /platform/android/jni | |
| parent | 8d62114762092e31f3465e17d764d92c94ac4fa5 (diff) | |
| download | mupdf-fe01358a4e3cf8e8c1d625937f89ddb9c1a7d8dc.tar.xz | |
Pass mimetype when opening a document from a stream.
Fixes opening non-PDF files from email programs that use a ContentProvider
to supply attachments.
Diffstat (limited to 'platform/android/jni')
| -rw-r--r-- | platform/android/jni/mupdf.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/platform/android/jni/mupdf.c b/platform/android/jni/mupdf.c index 04f1ceff..b9578d44 100644 --- a/platform/android/jni/mupdf.c +++ b/platform/android/jni/mupdf.c @@ -408,13 +408,14 @@ static void bufferStreamSeek(fz_stream *stream, int offset, int whence) } JNIEXPORT jlong JNICALL -JNI_FN(MuPDFCore_openBuffer)(JNIEnv * env, jobject thiz) +JNI_FN(MuPDFCore_openBuffer)(JNIEnv * env, jobject thiz, jstring jmagic) { globals *glo; fz_context *ctx; jclass clazz; fz_stream *stream = NULL; buffer_state *bs; + const char *magic; #ifdef NDK_PROFILER monstartup("libmupdf.so"); @@ -432,11 +433,20 @@ JNI_FN(MuPDFCore_openBuffer)(JNIEnv * env, jobject thiz) glo->thiz = thiz; buffer_fid = (*env)->GetFieldID(env, clazz, "fileBuffer", "[B"); + magic = (*env)->GetStringUTFChars(env, jmagic, NULL); + if (magic == NULL) + { + LOGE("Failed to get magic"); + free(glo); + return 0; + } + /* 128 MB store for low memory devices. Tweak as necessary. */ glo->ctx = ctx = fz_new_context(NULL, NULL, 128 << 20); if (!ctx) { LOGE("Failed to initialise context"); + (*env)->ReleaseStringUTFChars(env, jmagic, magic); free(glo); return 0; } @@ -458,7 +468,7 @@ JNI_FN(MuPDFCore_openBuffer)(JNIEnv * env, jobject thiz) fz_try(ctx) { glo->current_path = NULL; - glo->doc = fz_open_document_with_stream(ctx, "", stream); + glo->doc = fz_open_document_with_stream(ctx, magic, stream); alerts_init(glo); } fz_catch(ctx) @@ -482,6 +492,8 @@ JNI_FN(MuPDFCore_openBuffer)(JNIEnv * env, jobject thiz) glo = NULL; } + (*env)->ReleaseStringUTFChars(env, jmagic, magic); + return (jlong)(intptr_t)glo; } |