fix night mode confusion in preloaded assets

Author: ajungg

CHANGELOG.md

@@ -2,8 +2,9 @@
 All notable changes to this project will be documented in this file.
 
 ## [0.34.3]
-
+ 
 ### Fixed
+- Fixed night mode confusion in not preloaded assets
 - Update CameraX to 1.0.0-rc04 to fix a camera initialization crash on Samsung Galaxy S20 Ultra 5G
 
 ## [0.34.2]

core/src/main/java/io/snabble/sdk/Assets.java

@@ -230,18 +230,13 @@ private void downloadAssets(Project project, ApiManifest apiManifest, String non
                 String hash = Utils.sha1Hex(url);
                 hashes.add(hash);
 
-                String nightModeFileName = null;
-                if (nonRootIncludedFileName != null) {
-                    nightModeFileName = getNightModeFileName(nonRootIncludedFileName);
-                }
-                boolean forceInclude = FilenameUtils.removeExtension(apiAsset.name).equals(nightModeFileName);
                 String ext = FilenameUtils.getExtension(apiAsset.name);
-                if (!ext.equals("svg") && !forceInclude) {
+                if (!ext.equals("svg") && !ext.equals("jpg") && !ext.equals("webp")) {
                     continue;
                 }
 
                 // exclude assets that are not in the root when not explicitly requested
-                if (apiAsset.name.contains("/") && !forceInclude) {
+                if (apiAsset.name.contains("/") && !apiAsset.name.equals(nonRootIncludedFileName)) {
                     continue;
                 }
 
@@ -362,11 +357,6 @@ public Bitmap getBitmap(String name, Type type) {
         }
     }
 
-    private String getNightModeFileName(String fileName) {
-        boolean nightMode = isNightModeActive(Snabble.getInstance().getApplication());
-        return FilenameUtils.removeExtension(fileName) + (nightMode ? "_dark" : "");
-    }
-
     private Asset getAsset(String name, Type type) {
         // currently a limitation due to asynchronous reads and saves,
         // could be solved with careful locking
@@ -378,7 +368,9 @@ private Asset getAsset(String name, Type type) {
             return null;
         }
 
-        String fileName = getNightModeFileName(name);
+        boolean nightMode = isNightModeActive(Snabble.getInstance().getApplication());
+
+        String fileName = FilenameUtils.removeExtension(name) + (nightMode ? "_dark" : "");
 
         switch (type) {
             case SVG: