Przeglądaj źródła

Make client cert stronger

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 7 lat temu
rodzic
commit
c8915f20da

+ 7 - 3
app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java

@@ -196,9 +196,13 @@ public class WebViewLoginController extends BaseController {
 
                 KeyChain.choosePrivateKeyAlias(getActivity(), alias -> {
                     try {
-                        PrivateKey changPrivateKey = KeyChain.getPrivateKey(getActivity(), alias);
-                        X509Certificate[] certificates = KeyChain.getCertificateChain(getActivity(), alias);
-                        request.proceed(changPrivateKey, certificates);
+                        if (alias != null) {
+                            PrivateKey privateKey = KeyChain.getPrivateKey(getActivity(), alias);
+                            X509Certificate[] certificates = KeyChain.getCertificateChain(getActivity(), alias);
+                            request.proceed(privateKey, certificates);
+                        } else {
+                            request.cancel();
+                        }
                     } catch (KeyChainException e) {
                         Log.e(TAG, "Failed to get keys via keychain exception");
                         request.cancel();