Skip to content

Commit c4967b0

Browse files
authored
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.
1 parent 730b917 commit c4967b0

1 file changed

Lines changed: 2 additions & 10 deletions

File tree

play-services-auth-blockstore/core/src/main/kotlin/org/microg/gms/auth/blockstore/BlockstoreApiService.kt

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,7 @@ class BlobstoreServiceImpl(val blockStore: BlockStoreImpl, override val lifecycl
7878
lifecycleScope.launch {
7979
runCatching {
8080
val retrieveBytes = blockStore.retrieveBytes()
81-
if (retrieveBytes != null) {
82-
callback?.onBytesResult(Status.SUCCESS, retrieveBytes)
83-
} else {
84-
callback?.onBytesResult(Status.INTERNAL_ERROR, null)
85-
}
81+
callback?.onBytesResult(Status.SUCCESS, retrieveBytes)
8682
}
8783
}
8884
}
@@ -142,11 +138,7 @@ class BlobstoreServiceImpl(val blockStore: BlockStoreImpl, override val lifecycl
142138
runCatching {
143139
val retrieveBytesResponse = blockStore.retrieveBytesWithRequest(request)
144140
Log.d(TAG, "retrieveBytesWithRequest: retrieveBytesResponse: $retrieveBytesResponse")
145-
if (retrieveBytesResponse != null) {
146-
callback?.onResponseResult(Status.SUCCESS, retrieveBytesResponse)
147-
} else {
148-
callback?.onResponseResult(Status.INTERNAL_ERROR, RetrieveBytesResponse(Bundle.EMPTY, emptyList()))
149-
}
141+
callback?.onResponseResult(Status.SUCCESS, retrieveBytesResponse ?: RetrieveBytesResponse(Bundle.EMPTY, emptyList()))
150142
}
151143
}
152144
}

0 commit comments

Comments
 (0)