From 48fa1df3ba6623163fa7f468910515580f75cfad Mon Sep 17 00:00:00 2001 From: XxJSONDeruloxX Date: Fri, 23 Oct 2026 17:06:32 -0400 Subject: [PATCH] fix(stores): guard sign-in and local fixtures --- .../launcher/stores/amazon/AmazonBackend.kt | 51 ++++++++++++++----- tools/tests/test_runtime_inputs.py | 4 +- 2 files changed, 40 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/amazon/AmazonBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/amazon/AmazonBackend.kt index daa67b3f0c..e0beb381ff 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/amazon/AmazonBackend.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/amazon/AmazonBackend.kt @@ -2,6 +2,7 @@ package com.droiddeck.launcher.stores.amazon import android.content.Context import android.content.Intent +import android.util.Log import com.droiddeck.launcher.R import com.droiddeck.launcher.stores.CatalogItem import com.droiddeck.launcher.stores.InstalledStoreGame @@ -17,31 +18,53 @@ import org.json.JSONObject object AmazonBackend : StoreBackend { override val store: Store = Store.AMAZON + private val signingIn = java.util.concurrent.atomic.AtomicBoolean(false) init { LoginFlows.amazonFlow = { AmazonLogin.create() } } override fun signIn(context: Context) { + if (!signingIn.compareAndSet(false, true)) return val app = context.applicationContext - Thread({ - val available = AmazonNative.prepare(app) { state -> - if (state is com.droiddeck.launcher.core.AddonPack.State.Downloading) { - StoresState.post { StoresState.status[store] = app.getString(R.string.stores_engine_downloading, store.label, (state.progress * 100).toInt()) } + try { + Thread({ + try { + val available = runCatching { + AmazonNative.prepare(app) { state -> + if (state is com.droiddeck.launcher.core.AddonPack.State.Downloading) { + StoresState.post { StoresState.status[store] = app.getString(R.string.stores_engine_downloading, store.label, (state.progress * 100).toInt()) } + } + } + }.onFailure { Log.w("AmazonBackend", "Engine preparation failed", it) }.getOrDefault(false) + StoresState.post { + try { + StoresState.status.remove(store) + if (available) { + StoresState.problems.remove(store) + app.startActivity(Intent(app, StoreLoginActivity::class.java) + .putExtra(StoreLoginActivity.EXTRA_STORE, store.id) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) + } else { + StoresState.problems[store] = app.getString(R.string.stores_engine_failed, store.label) + } + } finally { + signingIn.set(false) + } + } + } catch (error: Exception) { + signingIn.set(false) + Log.w("AmazonBackend", "Could not finish engine preparation", error) } - } + }, "amazon-engine").start() + } catch (error: Exception) { + signingIn.set(false) StoresState.post { StoresState.status.remove(store) - if (available) { - StoresState.problems.remove(store) - app.startActivity(Intent(app, StoreLoginActivity::class.java) - .putExtra(StoreLoginActivity.EXTRA_STORE, store.id) - .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) - } else { - StoresState.problems[store] = app.getString(R.string.stores_engine_failed, store.label) - } + StoresState.problems[store] = app.getString(R.string.stores_engine_failed, store.label) } - }, "amazon-engine").start() + Log.w("AmazonBackend", "Could not start engine preparation", error) + } } override fun signOut(context: Context) { diff --git a/tools/tests/test_runtime_inputs.py b/tools/tests/test_runtime_inputs.py index 0d963cfdc9..5aef0b357f 100644 --- a/tools/tests/test_runtime_inputs.py +++ b/tools/tests/test_runtime_inputs.py @@ -46,8 +46,10 @@ class RuntimeInputsTest(unittest.TestCase): def packs(self): self.pack('tracking', {library.rsplit('/', 1)[1]: b'library' for library in runtime.PACKED_LIBRARIES}) packed = {} + outputs = runtime.outputs(self.root) for name, (pack, rel) in runtime.PACKED_FILES.items(): - packed.setdefault(pack, {})[rel] = (self.root / runtime.outputs(self.root)[name]).read_bytes() + if name in outputs: + packed.setdefault(pack, {})[rel] = (self.root / outputs[name]).read_bytes() for name, files in packed.items(): self.pack(name, files) for prefix, name in runtime.PACKED.items():