Use odrcode v5 (#380)

Author: andiwand

.github/workflows/android_main.yml

@@ -42,7 +42,10 @@ jobs:
       run: echo "y" | sudo ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;${{ env.ndk_version }}"
 
     - name: conan remote
-      run: conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
+      run: |
+        conan remote remove "*"
+        conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
+        conan remote add conancenter https://center2.conan.io
     - name: conan profile
       run: conan profile detect
 

app/build.gradle

@@ -20,7 +20,10 @@ tasks.register('conanProfile', Copy) {
 ["armv8", "armv7", "x86", "x86_64"].each { architecture ->
     tasks.named("conanInstall-" + architecture) {
         profile.set('build/conanprofile.txt')
+        deployer.set('conandeployer.py')
+        deployerFolder.set(outputDirectory.get().asFile.toString() + "/assets/core")
         dependsOn(tasks.named('conanProfile'))
+        conanExecutable.set('conan')
     }
 }
 
@@ -121,6 +124,11 @@ android {
         }
     }
     namespace 'at.tomtasche.reader'
+    compileSdk 35
+    buildToolsVersion '34.0.0'
+
+    // TODO can and should this be architecture dependent?
+    sourceSets.main.assets.srcDirs += "build/conan/armv8/assets"
 }
 
 dependencies {
@@ -140,9 +148,9 @@ dependencies {
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.webkit:webkit:1.11.0'
 
-    implementation 'app.opendocument:pdf2htmlex-android:0.18.26'
     implementation 'app.opendocument:wvware-android:1.2.11'
     implementation 'com.github.huzongyao:AndroidMagic:v1.1.2'
+    implementation 'com.viliussutkus89:assetextractor-android:1.3.3'
 
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
     androidTestImplementation 'androidx.test:rules:1.6.1'

app/conandeployer.py

@@ -0,0 +1,54 @@
+import shutil
+
+
+def deploy(graph, output_folder: str, **kwargs):
+    conanfile = graph.root.conanfile
+    conanfile.output.info(f"Custom deployer to {output_folder}")
+
+    symlinks = conanfile.conf.get("tools.deployer:symlinks", check_type=bool, default=True)
+    arch = conanfile.settings.get_safe("arch")
+
+    conanfile.output.info(f"Symlinks: {symlinks}")
+    conanfile.output.info(f"Arch: {arch}")
+
+    deps = {dep.ref.name: dep for dep in conanfile.dependencies.values()}
+
+    print(f"Dependencies: {list(deps.keys())}")
+
+    copytree_kwargs = {"symlinks": symlinks, "dirs_exist_ok": True}
+
+    if "odrcore" in deps:
+        dep = deps["odrcore"]
+        conanfile.output.info(f"Deploying odrcore to {output_folder}")
+        shutil.copytree(
+            f"{dep.package_folder}/share",
+            f"{output_folder}/odrcore",
+            **copytree_kwargs,
+        )
+
+    if "pdf2htmlex" in deps:
+        dep = deps["pdf2htmlex"]
+        conanfile.output.info(f"Deploying pdf2htmlex to {output_folder}")
+        shutil.copytree(
+            f"{dep.package_folder}/share/pdf2htmlEX",
+            f"{output_folder}/pdf2htmlex",
+            **copytree_kwargs,
+        )
+
+    if "poppler-data" in deps:
+        dep = deps["poppler-data"]
+        conanfile.output.info(f"Deploying poppler-data to {output_folder}")
+        shutil.copytree(
+            f"{dep.package_folder}/share/poppler",
+            f"{output_folder}/poppler",
+            **copytree_kwargs,
+        )
+
+    if "fontconfig" in deps:
+        dep = deps["fontconfig"]
+        conanfile.output.info(f"Deploying fontconfig to {output_folder}")
+        shutil.copytree(
+            f"{dep.package_folder}/res/share",
+            f"{output_folder}/fontconfig",
+            **copytree_kwargs,
+        )

app/conanfile.txt

@@ -1,6 +1,11 @@
 [requires]
-odrcore/4.1.1@
+odrcore/5.0.0-pre12
 
 [generators]
 CMakeToolchain
 CMakeDeps
+
+[options]
+odrcore/*:shared=True
+odrcore/*:with_pdf2htmlEX=True
+odrcore/*:with_wvWare=False

app/src/androidTest/java/at/tomtasche/reader/test/CoreTest.java

@@ -59,7 +59,6 @@ private static void copy(InputStream src, File dst) throws IOException {
     @Test
     public void test() {
         CoreWrapper core = new CoreWrapper();
-        core.initialize();
 
         File cacheDir = InstrumentationRegistry.getInstrumentation().getTargetContext().getCacheDir();
         File htmlFile = new File(cacheDir, "html");

app/src/main/AndroidManifest.xml

@@ -49,6 +49,7 @@
         android:label="@string/app_title"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:theme="@style/MainTheme"
+        android:networkSecurityConfig="@xml/network_security_config"
         tools:replace="android:label">
 
         <!-- https://stackoverflow.com/a/78086604/198996 -->