Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b154934 authored by Jonathan Klee's avatar Jonathan Klee
Browse files

fix: return SUCCESS with empty result when no BlockStore data exists 

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.
parent e95273f5

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

+2 −10
Original line number Diff line number Diff line
@@ -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)

                }

            }

        }

    }
@@ -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()))

            }

        }

    }