Merge pull request flutter#28 from collinjackson/flutter#1966

[firebase_remote_config] Fix Future already completed RemoteConfig.instance
jusst-engineering · Aug 30, 2019 · 08dad0c · 08dad0c
2 parents 30359c7 + e21316b
commit 08dad0c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/packages/firebase_remote_config/CHANGELOG.md b/packages/firebase_remote_config/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.2.0+7
+
+* Fix `Bad state: Future already completed` error when initially
+  calling `RemoteConfig.instance` multiple times in parallel.
+
 ## 0.2.0+6
 
 * Update documentation to reflect new repository location.

diff --git a/packages/firebase_remote_config/lib/src/remote_config.dart b/packages/firebase_remote_config/lib/src/remote_config.dart
@@ -33,12 +33,12 @@ class RemoteConfig extends ChangeNotifier {
   /// Gets the instance of RemoteConfig for the default Firebase app.
   static Future<RemoteConfig> get instance async {
     if (!_instanceCompleter.isCompleted) {
-      _getRemoteConfigInstance();
+      _instanceCompleter.complete(await _getRemoteConfigInstance());
     }
     return _instanceCompleter.future;
   }
 
-  static void _getRemoteConfigInstance() async {
+  static Future<RemoteConfig> _getRemoteConfigInstance() async {
     final Map<String, dynamic> properties =
         await channel.invokeMapMethod<String, dynamic>('RemoteConfig#instance');
 
@@ -53,7 +53,7 @@ class RemoteConfig extends ChangeNotifier {
     instance._remoteConfigSettings = remoteConfigSettings;
     instance._parameters =
         _parseRemoteConfigParameters(parameters: properties['parameters']);
-    _instanceCompleter.complete(instance);
+    return instance;
   }
 
   static Map<String, RemoteConfigValue> _parseRemoteConfigParameters(

diff --git a/packages/firebase_remote_config/pubspec.yaml b/packages/firebase_remote_config/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Remote Config. Update your application
   re-releasing.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/firebase_remote_config
-version: 0.2.0+6
+version: 0.2.0+7
 
 dependencies:
   flutter: