Add convenience constructor to E2EEOptions for shared key encryption (#917)

Author: davidliu

.changeset/lemon-bees-perform.md

@@ -0,0 +1,5 @@
+---
+"client-sdk-android": patch
+---
+
+Add convenience constructor to E2EEOptions for shared key encryption

livekit-android-sdk/src/main/java/io/livekit/android/e2ee/E2EEOptions.kt

@@ -27,7 +27,7 @@ internal const val defaultKeyRingSize = 16
 internal const val defaultDiscardFrameWhenCryptorNotReady = false
 internal val defaultKeyDerivationAlgorithm = FrameCryptorKeyDerivationAlgorithm.PBKDF2
 
-class E2EEOptions(
+data class E2EEOptions(
     var keyProvider: KeyProvider = BaseKeyProvider(
         defaultRatchetSalt,
         defaultMagicBytes,
@@ -38,11 +38,18 @@ class E2EEOptions(
         defaultDiscardFrameWhenCryptorNotReady,
         defaultKeyDerivationAlgorithm,
     ),
-    encryptionType: Encryption.Type = Encryption.Type.GCM,
+    var encryptionType: Encryption.Type = Encryption.Type.GCM,
 ) {
-    var encryptionType: Encryption.Type = Encryption.Type.NONE
-
-    init {
-        this.encryptionType = encryptionType
+    constructor(
+        /**
+         * The shared encryption key for the room.
+         */
+        sharedKey: String,
+        /**
+         * The encryption type to use. Defaults to GCM.
+         */
+        encryptionType: Encryption.Type = Encryption.Type.GCM,
+    ) : this(encryptionType = encryptionType) {
+        this.keyProvider.setSharedKey(sharedKey)
     }
 }

sample-app-common/src/main/java/io/livekit/android/sample/CallViewModel.kt

@@ -77,11 +77,11 @@ class CallViewModel(
 ) : AndroidViewModel(application) {
 
     private fun getE2EEOptions(): E2EEOptions? {
-        var e2eeOptions: E2EEOptions? = null
-        if (e2ee && e2eeKey != null) {
-            e2eeOptions = E2EEOptions()
+        var e2eeOptions = if (e2ee && e2eeKey != null) {
+            E2EEOptions(sharedKey = e2eeKey)
+        } else {
+            null
         }
-        e2eeOptions?.keyProvider?.setSharedKey(e2eeKey!!)
         return e2eeOptions
     }