From 1546a05568f5a097fbe1605225c944a108583993 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Wed, 12 Feb 2020 10:26:14 +0000
Subject: [PATCH] Catch exception if hardware-backed key can't be loaded.

---
 .../briarproject/briar/android/AndroidKeyStrengthener.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AndroidKeyStrengthener.java b/briar-android/src/main/java/org/briarproject/briar/android/AndroidKeyStrengthener.java
index db44062f9..f0c7d6a26 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/AndroidKeyStrengthener.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/AndroidKeyStrengthener.java
@@ -28,7 +28,9 @@ import static android.security.keystore.KeyProperties.PURPOSE_SIGN;
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 import static java.util.logging.Level.INFO;
+import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
+import static org.briarproject.bramble.util.LogUtils.logException;
 
 @RequiresApi(23)
 @NotNullByDefault
@@ -79,7 +81,10 @@ class AndroidKeyStrengthener implements KeyStrengthener {
 				return true;
 			}
 			return false;
-		} catch (GeneralSecurityException | IOException e) {
+		} catch (GeneralSecurityException e) {
+			logException(LOG, WARNING, e);
+			return false;
+		} catch (IOException e) {
 			throw new RuntimeException(e);
 		}
 	}