gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 19:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix NullPointerException on (first) account creation with client certificates (#195)

Browse Source 
Signed-off-by: Stephan Ritscher <no3pam@gmail.com>
This commit is contained in:
Stephan Ritscher 2020-03-07 23:15:19 +01:00 committed by Mario Đanić
parent 39c2dced64
commit 5a1e050928
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/talk/utils/ssl/MagicKeyManager.java
View File

@ -57,7 +57,7 @@ public class MagicKeyManager implements X509KeyManager {
@Override @Override
public String chooseClientAlias(String[] strings, Principal[] principals, Socket socket) { public String chooseClientAlias(String[] strings, Principal[] principals, Socket socket) {
String alias; String alias;
if (!TextUtils.isEmpty(alias = userUtils.getCurrentUser().getClientCertificate()) || if ((userUtils.getCurrentUser() != null && !TextUtils.isEmpty(alias = userUtils.getCurrentUser().getClientCertificate())) ||
!TextUtils.isEmpty(alias = appPreferences.getTemporaryClientCertAlias()) !TextUtils.isEmpty(alias = appPreferences.getTemporaryClientCertAlias())
&& new ArrayList<>(Arrays.asList(getClientAliases())).contains(alias)) { && new ArrayList<>(Arrays.asList(getClientAliases())).contains(alias)) {
return alias; return alias;