Merge pull request #744 from CesiumGS/android-crash

Revert change to Android cache DB location
CesiumGS · Feb 1, 2022 · e4158fd · e4158fd
2 parents a1a2ed6 + a268c62
commit e4158fd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,11 @@
 # Change Log
 
+### v1.10.1 - 2022-02-01
+
+##### Fixes :wrench:
+
+- Fixed a crash at startup on Android devices introduced in v1.10.0.
+
 ### v1.10.0 - 2022-02-01
 
 ##### Breaking Changes :mega:

diff --git a/CesiumForUnreal.uplugin b/CesiumForUnreal.uplugin
@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
-	"Version": 20,
-	"VersionName": "1.10.0",
+	"Version": 21,
+	"VersionName": "1.10.1",
 	"FriendlyName": "Cesium for Unreal",
 	"Description": "Unlock the 3D geospatial ecosystem in Unreal Engine with real-world 3D content and a high accuracy full-scale WGS84 globe.",
 	"Category": "Geospatial",

diff --git a/Source/CesiumRuntime/Private/Cesium3DTileset.cpp b/Source/CesiumRuntime/Private/Cesium3DTileset.cpp
@@ -723,7 +723,9 @@ class UnrealResourcePreparer
 };
 
 static std::string getCacheDatabaseName() {
-#if PLATFORM_ANDROID || PLATFORM_IOS
+#if PLATFORM_ANDROID
+  FString BaseDirectory = FPaths::ProjectPersistentDownloadDir();
+#elif PLATFORM_IOS
   FString BaseDirectory =
       FPaths::Combine(*FPaths::ProjectSavedDir(), TEXT("Cesium"));
   if (!IFileManager::Get().DirectoryExists(*BaseDirectory)) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cesium-unreal",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "description": "Cesium for Unreal",
   "main": "index.js",
   "directories": {