Merge branch 'main' into replace-magic

Author: andiwand

app/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:installLocation="auto"
-    android:versionCode="195"
-    android:versionName="3.40"
+    android:versionCode="196"
+    android:versionName="4.0"
     tools:ignore="GoogleAppIndexingWarning">
 
     <uses-permission android:name="android.permission.INTERNET" />

app/src/main/cpp/core_wrapper.cpp

@@ -198,7 +198,8 @@ Java_at_tomtasche_reader_background_CoreWrapper_parseNative(JNIEnv *env, jclass
                 }
             }
 
-            if (file.is_document_file()) {
+            // .doc-files are not real documents in core
+            if (file.is_document_file() && fileType != odr::FileType::legacy_word_document) {
                 // TODO this will cause a second load
                 s_document = file.as_document_file().document();
             }
@@ -412,7 +413,11 @@ Java_at_tomtasche_reader_background_CoreWrapper_hostFileNative(JNIEnv *env, jcla
                 }
             }
 
-            if (file.is_document_file()) {
+            __android_log_print(ANDROID_LOG_INFO, "smn", "type=%s",
+                                file_type_to_string(file.file_type()).c_str());
+
+            // .doc-files are not real documents in core
+            if (file.is_document_file() && file.file_type() != odr::FileType::legacy_word_document) {
                 // TODO this will cause a second load
                 s_document = file.as_document_file().document();
             }

app/src/main/java/at/tomtasche/reader/background/CoreLoader.java

@@ -60,6 +60,7 @@ public boolean isSupported(Options options) {
         return options.fileType.startsWith("application/vnd.oasis.opendocument") ||
                 options.fileType.startsWith("application/x-vnd.oasis.opendocument") ||
                 options.fileType.startsWith("application/vnd.oasis.opendocument.text-master") ||
+                options.fileType.startsWith("application/msword") ||
                 (this.doOoxml && (
                         options.fileType.startsWith("application/vnd.openxmlformats-officedocument.wordprocessingml.document")
                         // TODO: enable xlsx and pptx too