From f008f27843ae223e02d6939b1d1ca6b11a10bb11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Heinrich=20Kie=C3=9Fling?= <pokulo@users.noreply.github.com>
Date: Mon, 12 Feb 2024 12:19:04 +0100
Subject: [PATCH] Fix Issue #2881: avoid NullPointerException in
 selectUserIdStatusByEmailLike

after upgrade of sqlitedb library sqldelight in commit 5d84bd838744f63d46d5a08110bad13b5192ae6a the method getUidStatusByEmailLike may suddenly raise a NullPointerException. This fix attempts to restore the prior behavior or simply returning null.
---
 .../java/org/sufficientlysecure/keychain/daos/UserIdDao.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/daos/UserIdDao.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/daos/UserIdDao.java
index aae3c2492..b582445f4 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/daos/UserIdDao.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/daos/UserIdDao.java
@@ -36,7 +36,7 @@ public class UserIdDao extends AbstractDao {
 
     public UidStatus getUidStatusByEmailLike(String emailLike) {
         return getDatabase().getUserPacketsQueries().selectUserIdStatusByEmailLike(emailLike)
-                .executeAsOne();
+                .executeAsOneOrNull();
     }
 
     public Map<String, UidStatus> getUidStatusByEmail(String... emails) {
@@ -62,4 +62,4 @@ public class UserIdDao extends AbstractDao {
         }
         return Arrays.asList(longs);
     }
-}
\ No newline at end of file
+}