fixed a bug that would cause FS access via gluon attach on embedded devices

AlmasB · AlmasB · commit 2cb4736da22f · 2021-07-28T17:16:10.000+01:00
diff --git a/fxgl-core/src/main/kotlin/com/almasb/fxgl/core/util/Platform.kt b/fxgl-core/src/main/kotlin/com/almasb/fxgl/core/util/Platform.kt
@@ -21,6 +21,9 @@ enum class Platform {
     val isDesktop: Boolean
         get() = this === WINDOWS || this === MAC || this === LINUX
 
+    val isEmbedded: Boolean
+        get() = this === EMBEDDED
+
     companion object {
         @JvmStatic fun get(): Platform {
             // check if running on mobile first
diff --git a/fxgl-io/src/main/kotlin/com/almasb/fxgl/io/FileSystemService.kt b/fxgl-io/src/main/kotlin/com/almasb/fxgl/io/FileSystemService.kt
@@ -26,16 +26,16 @@ class FileSystemService : EngineService() {
 
     private val log = Logger.get(javaClass)
 
-    @Inject("isDesktop")
-    private var isDesktop = true
+    @Inject("isMobile")
+    private var isMobile = false
 
     @Inject("isFileSystemWriteAllowed")
     private var isFileSystemWriteAllowed = true
 
     private lateinit var fs: FileSystemAccess
 
     override fun onInit() {
-        val rootStorage = if (isDesktop)
+        val rootStorage = if (!isMobile)
             File(System.getProperty("user.dir") + "/")
         else
             StorageService.create()
diff --git a/fxgl-io/src/test/kotlin/com/almasb/fxgl/io/FileSystemServiceTest.kt b/fxgl-io/src/test/kotlin/com/almasb/fxgl/io/FileSystemServiceTest.kt
@@ -49,7 +49,7 @@ class FileSystemServiceTest {
 
             fs = FileSystemService()
             val injectMap = mapOf(
-                    "isDesktop" to true,
+                    "isMobile" to false,
                     "isFileSystemWriteAllowed" to true)
 
             InjectInTest.inject(MethodHandles.lookup(), fs, injectMap)
@@ -237,7 +237,7 @@ class FileSystemServiceTest {
     fun `Fail on mobile if no private storage present`() {
         val f = FileSystemService()
         val injectMap = mapOf(
-                "isDesktop" to false,
+                "isMobile" to true,
                 "isFileSystemWriteAllowed" to true)
 
         InjectInTest.inject(MethodHandles.lookup(), f, injectMap)
@@ -251,7 +251,7 @@ class FileSystemServiceTest {
     fun `FS is not changed if FS write is not allowed`() {
         val f = FileSystemService()
         val injectMap = mapOf(
-                "isDesktop" to true,
+                "isMobile" to false,
                 "isFileSystemWriteAllowed" to false)
 
         InjectInTest.inject(MethodHandles.lookup(), f, injectMap)
diff --git a/fxgl/src/main/kotlin/com/almasb/fxgl/app/Settings.kt b/fxgl/src/main/kotlin/com/almasb/fxgl/app/Settings.kt
@@ -653,6 +653,9 @@ class ReadOnlyGameSettings internal constructor(
     val isMobile: Boolean
         get() = platform.isMobile
 
+    val isEmbedded: Boolean
+        get() = platform.isEmbedded
+
     val isBrowser: Boolean
         get() = platform.isBrowser
 
