Fix File not serializing correctly on Android 12 and therefore assets not loading after app restart

Author: ajungg

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.51.4]
+
+### Fixed
+- Fixed Assets not loading after second app startup on Android 12
+
 ## [0.51.3]
 
 ### Added

build.gradle

@@ -31,7 +31,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.51.3'
+        sdkVersion='0.51.4'
         versionCode=1
 
         compileSdkVersion=31

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

@@ -96,11 +96,11 @@ private class ApiManifest {
     }
 
     private class Asset {
-        public File file;
+        public String filePath;
         public String hash;
 
-        public Asset(File file, String hash) {
-            this.file = file;
+        public Asset(String filePath, String hash) {
+            this.filePath = filePath;
             this.hash = hash;
         }
     }
@@ -127,7 +127,7 @@ public interface Callback {
     Assets(Project project) {
         this.app = Snabble.getInstance().getApplication();
         this.project = project;
-        this.manifestFile = new File(project.getInternalStorageDirectory(), "assets.json");
+        this.manifestFile = new File(project.getInternalStorageDirectory(), "assets_v2.json");
         this.assetDir = new File(project.getInternalStorageDirectory(), "assets/");
         this.assetDir.mkdirs();
 
@@ -280,7 +280,7 @@ private void downloadAssets(Project project, ApiManifest apiManifest, String non
 
                             Logger.d("add " + apiAsset.name);
 
-                            Asset asset = new Asset(localFile, hash);
+                            Asset asset = new Asset(localFile.getAbsolutePath(), hash);
                             IOUtils.copy(body.byteStream(), new FileOutputStream(localFile));
 
                             Dispatch.mainThread(() -> {
@@ -303,7 +303,8 @@ private void downloadAssets(Project project, ApiManifest apiManifest, String non
                         if (!hashes.contains(asset.hash)) {
                             Logger.d("remove " + entry.getKey());
 
-                            asset.file.delete();
+                            File file = new File(asset.filePath);
+                            file.delete();
                             removals.add(entry.getKey());
                         }
                     }
@@ -414,7 +415,7 @@ private Bitmap getBitmapByType(String name, Type type) {
         if (asset != null) {
             try {
                 Logger.d("render %s %s/%s", type.name(), project.getId(), name);
-                return BitmapFactory.decodeStream(new FileInputStream(asset.file));
+                return BitmapFactory.decodeStream(new FileInputStream(asset.filePath));
             } catch (Exception e) {
                 Logger.d("could not decode " + name + ": " + e.toString());
                 return null;
@@ -433,7 +434,7 @@ private Bitmap getBitmapSVG(String name) {
                 Resources res = app.getResources();
                 DisplayMetrics dm = res.getDisplayMetrics();
 
-                SVG svg = SVG.getFromInputStream(new FileInputStream(asset.file));
+                SVG svg = SVG.getFromInputStream(new FileInputStream(asset.filePath));
                 int width = Math.round(svg.getDocumentWidth() * dm.density);
                 int height = Math.round(svg.getDocumentHeight() * dm.density);