diff --git a/app/src/main/cpp/CoreWrapper.cpp b/app/src/main/cpp/CoreWrapper.cpp index 80173c6ea84b..90195a833c10 100644 --- a/app/src/main/cpp/CoreWrapper.cpp +++ b/app/src/main/cpp/CoreWrapper.cpp @@ -68,6 +68,9 @@ Java_at_tomtasche_reader_background_CoreWrapper_parseNative(JNIEnv *env, jobject jfieldID txtField = env->GetFieldID(optionsClass, "txt", "Z"); jboolean txt = env->GetBooleanField(options, txtField); + jfieldID pdfField = env->GetFieldID(optionsClass, "pdf", "Z"); + jboolean pdf = env->GetBooleanField(options, pdfField); + jfieldID pagingField = env->GetFieldID(optionsClass, "paging", "Z"); jboolean paging = env->GetBooleanField(options, pagingField); @@ -112,6 +115,11 @@ Java_at_tomtasche_reader_background_CoreWrapper_parseNative(JNIEnv *env, jobject return result; } + if (!pdf && file.file_type() == odr::FileType::portable_document_format) { + env->SetIntField(result, errorField, -5); + return result; + } + odr::HtmlConfig config; config.editable = editable; diff --git a/app/src/main/java/at/tomtasche/reader/background/CoreWrapper.java b/app/src/main/java/at/tomtasche/reader/background/CoreWrapper.java index bcecd270203a..cbd4b319151c 100644 --- a/app/src/main/java/at/tomtasche/reader/background/CoreWrapper.java +++ b/app/src/main/java/at/tomtasche/reader/background/CoreWrapper.java @@ -82,6 +82,7 @@ public static class CoreOptions { public boolean ooxml; public boolean txt; + public boolean pdf; public boolean editable; diff --git a/app/src/main/java/at/tomtasche/reader/background/RawLoader.java b/app/src/main/java/at/tomtasche/reader/background/RawLoader.java index fcdf16dcaab5..aabc843813a1 100644 --- a/app/src/main/java/at/tomtasche/reader/background/RawLoader.java +++ b/app/src/main/java/at/tomtasche/reader/background/RawLoader.java @@ -140,7 +140,9 @@ public void loadSync(Options options) { CoreWrapper.CoreOptions coreOptions = new CoreWrapper.CoreOptions(); coreOptions.inputPath = cacheFile.getPath(); coreOptions.outputPath = cacheDirectory.getPath(); + coreOptions.ooxml = false; coreOptions.txt = true; + coreOptions.pdf = false; lastCoreOptions = coreOptions;