solve colliding assets

Author: andiwand

app/build.gradle

@@ -21,8 +21,9 @@ tasks.register('conanProfile', Copy) {
     tasks.named("conanInstall-" + architecture) {
         profile.set('build/conanprofile.txt')
         deployer.set('conandeployer.py')
-        deployerFolder.set(outputDirectory.get().asFile.toString() + "/assets")
+        deployerFolder.set(outputDirectory.get().asFile.toString() + "/assets/core")
         dependsOn(tasks.named('conanProfile'))
+        conanExecutable.set('/Users/andreas/odr/venv/bin/conan')
     }
 }
 

app/conanfile.txt

@@ -1,5 +1,5 @@
 [requires]
-odrcore/5.0.0-pre9
+odrcore/5.0.0-pre11
 
 [generators]
 CMakeToolchain

app/src/main/cpp/CoreWrapper.cpp

@@ -360,9 +360,21 @@ Java_at_tomtasche_reader_background_CoreWrapper_hostFile(JNIEnv *env, jclass cla
         }
     } catch (const std::exception &e) {
         __android_log_print(ANDROID_LOG_ERROR, "smn", "Unhandled C++ exception: %s", e.what());
+        env->SetIntField(result, errorField, -1);
+        return result;
+    } catch (const std::string &s) {
+        __android_log_print(ANDROID_LOG_ERROR, "smn", "Unhandled C++ string exception: %s", s.c_str());
+        env->SetIntField(result, errorField, -1);
+        return result;
+    } catch (int i) {
+        __android_log_print(ANDROID_LOG_ERROR, "smn", "Unhandled C++ int exception: %i", i);
+        env->SetIntField(result, errorField, -1);
+        return result;
     } catch (...) {
         __android_log_print(ANDROID_LOG_ERROR, "smn",
                             "Unhandled C++ exception without further information");
+        env->SetIntField(result, errorField, -1);
+        return result;
     }
 
     return result;

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

@@ -37,7 +37,7 @@ public CoreLoader(Context context, ConfigManager configManager, boolean doOoxml,
     public void initialize(FileLoaderListener listener, Handler mainHandler, Handler backgroundHandler, AnalyticsManager analyticsManager, CrashManager crashManager) {
         if (doHttp) {
             File serverCacheDir = new File(context.getCacheDir(), "core/server");
-            if (!serverCacheDir.mkdirs()) {
+            if (!serverCacheDir.isDirectory() && !serverCacheDir.mkdirs()) {
                 Log.e("CoreLoader", "Failed to create cache directory for CoreWrapper server: " + serverCacheDir.getAbsolutePath());
             }
             CoreWrapper.createServer(serverCacheDir.getAbsolutePath());

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

@@ -25,18 +25,18 @@ public static class GlobalParams {
     public static native void setGlobalParams(GlobalParams params);
 
     public static void initialize(Context context) {
-        File assetsDirectory = new File(context.getFilesDir(), "assets");
+        File assetsDirectory = new File(context.getFilesDir(), "assets/core");
         File odrCoreDataDirectory = new File(assetsDirectory, "odrcore");
         File fontconfigDataDirectory = new File(assetsDirectory, "fontconfig");
         File popplerDataDirectory = new File(assetsDirectory, "poppler");
         File pdf2htmlexDataDirectory = new File(assetsDirectory, "pdf2htmlex");
 
         AssetExtractor ae = new AssetExtractor(context.getAssets());
         ae.setOverwrite();
-        ae.extract(assetsDirectory, "odrcore");
-        ae.extract(assetsDirectory, "fontconfig");
-        ae.extract(assetsDirectory, "poppler");
-        ae.extract(assetsDirectory, "pdf2htmlex");
+        ae.extract(assetsDirectory, "core/odrcore");
+        ae.extract(assetsDirectory, "core/fontconfig");
+        ae.extract(assetsDirectory, "core/poppler");
+        ae.extract(assetsDirectory, "core/pdf2htmlex");
 
         CoreWrapper.GlobalParams globalParams = new CoreWrapper.GlobalParams();
         globalParams.coreDataPath = odrCoreDataDirectory.getAbsolutePath();

app/src/main/java/at/tomtasche/reader/ui/widget/PageView.java

@@ -140,6 +140,10 @@ public void onDownloadStart(String url, String userAgent,
     public void toggleDarkMode(boolean isDarkEnabled) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             setForceDarkAllowed(isDarkEnabled);
+        }
+
+        if (WebViewFeature.isFeatureSupported(WebViewFeature.ALGORITHMIC_DARKENING)) {
+            WebSettingsCompat.setAlgorithmicDarkeningAllowed(getSettings(), isDarkEnabled);
         } else if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) {
             WebSettingsCompat.setForceDark(getSettings(), isDarkEnabled ? WebSettingsCompat.FORCE_DARK_AUTO : WebSettingsCompat.FORCE_DARK_OFF);
         }