Merge PR #165

Yubico · Jan 21, 2025 · 401cadd · 401cadd
2 parents d3e1229 + 808379b
commit 401cadd
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/android/src/main/java/com/yubico/yubikit/android/transport/nfc/NfcYubiKeyDevice.java b/android/src/main/java/com/yubico/yubikit/android/transport/nfc/NfcYubiKeyDevice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 Yubico.
+ * Copyright (C) 2019-2025 Yubico.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -150,7 +150,8 @@ public <T extends YubiKeyConnection> void requestConnection(
                           "openConnection("
                               + connectionType.getSimpleName()
                               + ") exception: "
-                              + exception.getMessage())));
+                              + exception.getMessage(),
+                          exception)));
             }
           });
   }

diff --git a/android/src/main/java/com/yubico/yubikit/android/transport/usb/UsbYubiKeyDevice.java b/android/src/main/java/com/yubico/yubikit/android/transport/usb/UsbYubiKeyDevice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 Yubico.
+ * Copyright (C) 2019-2025 Yubico.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -133,6 +133,15 @@ public <T extends YubiKeyConnection> void requestConnection(
               callback.invoke(Result.success(connection));
             } catch (IOException e) {
               callback.invoke(Result.failure(e));
+            } catch (Exception exception) {
+              callback.invoke(
+                  Result.failure(
+                      new IOException(
+                          "openConnection("
+                              + connectionType.getSimpleName()
+                              + ") exception: "
+                              + exception.getMessage(),
+                          exception)));
             }
           });
     }
@@ -197,6 +206,12 @@ private CachedOtpConnection(Callback<Result<OtpConnection, IOException>> callbac
               }
             } catch (IOException e) {
               callback.invoke(Result.failure(e));
+            } catch (Exception exception) {
+              callback.invoke(
+                  Result.failure(
+                      new IOException(
+                          "openConnection(OtpConnection) exception: " + exception.getMessage(),
+                          exception)));
             }
           });
     }