From 5a1e050928f3f321d35875a92f091ed3d8f249f9 Mon Sep 17 00:00:00 2001
From: Stephan Ritscher <no3pam@gmail.com>
Date: Sat, 7 Mar 2020 23:15:19 +0100
Subject: [PATCH] Fix NullPointerException on (first) account creation with
client certificates (#195)
Signed-off-by: Stephan Ritscher <no3pam@gmail.com>
---
.../main/java/com/nextcloud/talk/utils/ssl/MagicKeyManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/src/main/java/com/nextcloud/talk/utils/ssl/MagicKeyManager.java b/app/src/main/java/com/nextcloud/talk/utils/ssl/MagicKeyManager.java
index ec05763ff..090b4e0c4 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/ssl/MagicKeyManager.java
+++ b/app/src/main/java/com/nextcloud/talk/utils/ssl/MagicKeyManager.java
@@ -57,7 +57,7 @@ public class MagicKeyManager implements X509KeyManager {
@Override
public String chooseClientAlias(String[] strings, Principal[] principals, Socket socket) {
String alias;
- if (!TextUtils.isEmpty(alias = userUtils.getCurrentUser().getClientCertificate()) ||
+ if ((userUtils.getCurrentUser() != null && !TextUtils.isEmpty(alias = userUtils.getCurrentUser().getClientCertificate())) ||
!TextUtils.isEmpty(alias = appPreferences.getTemporaryClientCertAlias())
&& new ArrayList<>(Arrays.asList(getClientAliases())).contains(alias)) {
return alias;