From c4967b018e009f12c0dafb825e881421bdbeb83d Mon Sep 17 00:00:00 2001 From: Jonathan Klee Date: Mon, 8 Jun 2026 22:15:45 +0200 Subject: [PATCH] fix: return SUCCESS with empty result when no BlockStore data exists (#3503) Returning INTERNAL_ERROR when no data is stored yet caused apps to crash on first launch, as the absence of data is a valid empty-success state. --- .../gms/auth/blockstore/BlockstoreApiService.kt | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/play-services-auth-blockstore/core/src/main/kotlin/org/microg/gms/auth/blockstore/BlockstoreApiService.kt b/play-services-auth-blockstore/core/src/main/kotlin/org/microg/gms/auth/blockstore/BlockstoreApiService.kt index 299628a83..7ef1430fa 100644 --- a/play-services-auth-blockstore/core/src/main/kotlin/org/microg/gms/auth/blockstore/BlockstoreApiService.kt +++ b/play-services-auth-blockstore/core/src/main/kotlin/org/microg/gms/auth/blockstore/BlockstoreApiService.kt @@ -78,11 +78,7 @@ class BlobstoreServiceImpl(val blockStore: BlockStoreImpl, override val lifecycl lifecycleScope.launch { runCatching { val retrieveBytes = blockStore.retrieveBytes() - if (retrieveBytes != null) { - callback?.onBytesResult(Status.SUCCESS, retrieveBytes) - } else { - callback?.onBytesResult(Status.INTERNAL_ERROR, null) - } + callback?.onBytesResult(Status.SUCCESS, retrieveBytes) } } } @@ -142,11 +138,7 @@ class BlobstoreServiceImpl(val blockStore: BlockStoreImpl, override val lifecycl runCatching { val retrieveBytesResponse = blockStore.retrieveBytesWithRequest(request) Log.d(TAG, "retrieveBytesWithRequest: retrieveBytesResponse: $retrieveBytesResponse") - if (retrieveBytesResponse != null) { - callback?.onResponseResult(Status.SUCCESS, retrieveBytesResponse) - } else { - callback?.onResponseResult(Status.INTERNAL_ERROR, RetrieveBytesResponse(Bundle.EMPTY, emptyList())) - } + callback?.onResponseResult(Status.SUCCESS, retrieveBytesResponse ?: RetrieveBytesResponse(Bundle.EMPTY, emptyList())) } } }