Wrap and propagate unexpected exceptions

2020-07-07 00:52:11 -05:00
parent a99e070c26
commit 484be9bfe6
3 changed files with 22 additions and 29 deletions
@@ -43,25 +43,26 @@ public class NvConnection {
        this.context = new ConnectionContext();
        this.context.streamConfig = config;
        this.context.serverCert = serverCert;
-        try {
-            // This is unique per connection
-            this.context.riKey = generateRiAesKey();
-        } catch (NoSuchAlgorithmException e) {
-            // Should never happen
-            e.printStackTrace();
-        }
-        
-        this.context.riKeyId = generateRiKeyId();
+
+        // This is unique per connection
+        this.context.riKey = generateRiAesKey();
+        context.riKeyId = generateRiKeyId();
+
        this.isMonkey = ActivityManager.isUserAMonkey();
    }
    
-    private static SecretKey generateRiAesKey() throws NoSuchAlgorithmException {
-        KeyGenerator keyGen = KeyGenerator.getInstance("AES");
-        
-        // RI keys are 128 bits
-        keyGen.init(128);
-        
-        return keyGen.generateKey();
+    private static SecretKey generateRiAesKey() {
+        try {
+            KeyGenerator keyGen = KeyGenerator.getInstance("AES");
+
+            // RI keys are 128 bits
+            keyGen.init(128);
+
+            return keyGen.generateKey();
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
    }
    
    private static int generateRiKeyId() {