From b036a147481985da06a603f20073cc1d876082d9 Mon Sep 17 00:00:00 2001
From: Bart Nijland <bartnijland91@gmail.com>
Date: Fri, 23 Jul 2021 14:49:29 +0200
Subject: [PATCH] Fix creating eu green cards (#516)

---
 .../usecases/SyncRemoteGreenCardsUseCase.kt        | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/holder/src/main/java/nl/rijksoverheid/ctr/holder/persistence/database/usecases/SyncRemoteGreenCardsUseCase.kt b/holder/src/main/java/nl/rijksoverheid/ctr/holder/persistence/database/usecases/SyncRemoteGreenCardsUseCase.kt
index df786ec0d..6a877d290 100644
--- a/holder/src/main/java/nl/rijksoverheid/ctr/holder/persistence/database/usecases/SyncRemoteGreenCardsUseCase.kt
+++ b/holder/src/main/java/nl/rijksoverheid/ctr/holder/persistence/database/usecases/SyncRemoteGreenCardsUseCase.kt
@@ -25,18 +25,20 @@ class SyncRemoteGreenCardsUseCaseImpl(
             mobileCoreWrapper.createDomesticCredentials(
                 createCredentials = remoteGreenCards.domesticGreencard.createCredentialMessages
             )
-        } else return
+        } else null
 
         // Clear everything from the database
         holderDatabase.greenCardDao().deleteAll()
         holderDatabase.originDao().deleteAll()
         holderDatabase.credentialDao().deleteAll()
 
-        remoteGreenCards.domesticGreencard.let {
-            createDomesticGreenCardUseCase.create(
-                greenCard = it,
-                domesticCredentials = domesticCredentials,
-            )
+        domesticCredentials?.let { domesticCredentials ->
+            remoteGreenCards.domesticGreencard?.let { domesticGreenCard ->
+                createDomesticGreenCardUseCase.create(
+                    greenCard = domesticGreenCard,
+                    domesticCredentials = domesticCredentials,
+                )
+            }
         }
 
         remoteGreenCards.euGreencards?.let {