diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5b1af9a2dc..25ef8cc09c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -192,7 +192,8 @@ jobs: GH_TOKEN: ${{ github.token }} run: | set -euo pipefail - sudo apt-get update -qq + sudo apt-get -o Dir::Etc::sourcelist=sources.list.d/ubuntu.sources \ + -o Dir::Etc::sourceparts=- -o Acquire::Retries=3 update -qq sudo apt-get install -y -qq gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libvulkan1 mesa-vulkan-drivers >/dev/null D=app/src/main/assets/linuxfs mkdir -p "$D" diff --git a/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt index ccfd221aca..7c00981b22 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt @@ -13,6 +13,7 @@ import java.io.File import java.net.HttpURLConnection import java.net.URL import java.security.MessageDigest +import java.util.concurrent.Executor import java.util.concurrent.Executors import java.util.concurrent.TimeUnit import org.json.JSONObject @@ -150,19 +151,22 @@ object CloudSaves { fun keepCloud(context: Context, store: Store, id: String): Result = download(context, store, id, force = true) fun keepLocal(context: Context, store: Store, id: String): Result = upload(context, store, id, force = true) - fun downloadOrDefer(context: Context, store: Store, id: String): Result { + fun downloadOrDefer(context: Context, store: Store, id: String): Result = + downloadOrDefer(context, store, id, Executor { Thread(it, "cloud-deferred").start() }) + + internal fun downloadOrDefer(context: Context, store: Store, id: String, executor: Executor): Result { val app = context.applicationContext val g = game(app, store, id) ?: return done(store, id, "down", Result("skipped", 0, 0, "not-installed")) if (!g.second.cloud) return done(store, id, "down", Result("skipped", 0, 0, "off")) if (prefix(app, g.first)?.let { CloudSavePaths.profile(it).isDirectory } == true) return download(app, store, id) - Thread({ + executor.execute { val end = System.currentTimeMillis() + PREFIX_WAIT_MS while (System.currentTimeMillis() < end) { - if (prefix(app, g.first)?.let { CloudSavePaths.profile(it).isDirectory } == true) { download(app, store, id); return@Thread } + if (prefix(app, g.first)?.let { CloudSavePaths.profile(it).isDirectory } == true) { download(app, store, id); return@execute } Thread.sleep(2000) } done(store, id, "down", Result("skipped", 0, 0, "no-prefix")) - }, "cloud-deferred").start() + } return done(store, id, "down", Result("deferred", 0, 0, "no-prefix")) } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/CloudSavesTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/CloudSavesTest.kt index 023013ed52..0c30447430 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/CloudSavesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/CloudSavesTest.kt @@ -1,6 +1,7 @@ package com.droiddeck.launcher.stores import java.io.File +import java.util.concurrent.Executor import org.junit.Assert.assertArrayEquals import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue @@ -11,7 +12,7 @@ import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) -@Config(sdk = [33]) +@Config(sdk = [33], application = android.app.Application::class) class CloudSavesTest { private val app get() = RuntimeEnvironment.getApplication() @@ -83,9 +84,11 @@ class CloudSavesTest { } @Test fun aFirstLaunchWithoutAPrefixIsDeferredNotBlocked() { + val deferred = ArrayList() val folder = File(StoreInstallRoot.storeDir(StoreInstallRoot.internalRoot(app), Store.GOG), "ELDERBORN").apply { mkdirs() } File(folder, "ELDERBORN.exe").writeText("MZ") StoreGameSidecar(Store.GOG, "1207664643", "ELDERBORN", "ELDERBORN.exe").write(folder) - assertEquals("deferred", CloudSaves.downloadOrDefer(app, Store.GOG, "1207664643").result) + assertEquals("deferred", CloudSaves.downloadOrDefer(app, Store.GOG, "1207664643", Executor { deferred += it }).result) + assertEquals(1, deferred.size) } }