f1

Author: hiroshihorie

lib/src/e2ee/e2ee_manager.dart

@@ -52,7 +52,7 @@ class E2EEManager {
   }
 
   Future<void> setup(Room room) async {
-    _keyProvider ??= _options.keyProvider ?? await _buildSharedKeyProvider(_options.sharedKey!);
+    _keyProvider ??= _options.keyProviderOrNull ?? await _buildSharedKeyProvider(_options.sharedKey!);
     if (_room != room) {
       await _cleanUp();
       _room = room;

lib/src/e2ee/options.dart

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import 'package:meta/meta.dart';
+
 import 'key_provider.dart';
 
 enum EncryptionType {
@@ -26,18 +28,37 @@ enum EncryptionType {
 /// or a shared passphrase ([E2EEOptions.sharedKey]). Resolution of the
 /// passphrase into a native key provider is deferred to [E2EEManager.setup].
 class E2EEOptions {
-  /// A pre-built [BaseKeyProvider], or `null` when this instance was created
-  /// via [E2EEOptions.sharedKey].
-  final BaseKeyProvider? keyProvider;
+  final BaseKeyProvider? _keyProvider;
 
-  /// A shared passphrase, or `null` when a [keyProvider] was provided.
+  /// A shared passphrase, or `null` when a [BaseKeyProvider] was provided.
   final String? sharedKey;
 
   final EncryptionType encryptionType = EncryptionType.kGcm;
 
-  const E2EEOptions({required BaseKeyProvider this.keyProvider}) : sharedKey = null;
+  const E2EEOptions({required BaseKeyProvider keyProvider})
+      : _keyProvider = keyProvider,
+        sharedKey = null;
 
   const E2EEOptions.sharedKey(String key)
       : sharedKey = key,
-        keyProvider = null;
+        _keyProvider = null;
+
+  /// The underlying [BaseKeyProvider].
+  ///
+  /// Available immediately when built via the default constructor. Throws
+  /// [StateError] when built via [E2EEOptions.sharedKey] — the provider is
+  /// created lazily inside [E2EEManager.setup]; read it from
+  /// `room.e2eeManager!.keyProvider` after connect instead.
+  BaseKeyProvider get keyProvider =>
+      _keyProvider ??
+      (throw StateError(
+        'E2EEOptions was constructed via E2EEOptions.sharedKey(...); '
+        'BaseKeyProvider is built lazily inside E2EEManager.setup(). '
+        'Access it via room.e2eeManager!.keyProvider after connect.',
+      ));
+
+  /// Internal accessor used by [E2EEManager.setup] to read the pre-built
+  /// provider without triggering the throwing [keyProvider] getter.
+  @internal
+  BaseKeyProvider? get keyProviderOrNull => _keyProvider;
 }