fix(storage): set emulator once for each bucket it is required

firebase · Nov 13, 2023 · 4860783 · 4860783
1 parent 7c4180a
commit 4860783
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/packages/firebase_storage/firebase_storage/ios/Classes/FLTFirebaseStoragePlugin.m b/packages/firebase_storage/firebase_storage/ios/Classes/FLTFirebaseStoragePlugin.m
@@ -68,7 +68,7 @@ @interface FLTFirebaseStoragePlugin ()
 @implementation FLTFirebaseStoragePlugin {
   NSMutableDictionary<NSNumber *, FIRStorageObservableTask<FIRStorageTaskManagement> *> *_tasks;
   dispatch_queue_t _callbackQueue;
-  bool hasEmulatorBooted;
+  NSMutableDictionary<NSString *, NSNumber *> *_emulatorBooted;
   NSObject<FlutterBinaryMessenger> *_binaryMessenger;
   NSMutableDictionary<NSString *, FlutterEventChannel *> *_eventChannels;
   NSMutableDictionary<NSString *, NSObject<FlutterStreamHandler> *> *_streamHandlers;
@@ -97,7 +97,7 @@ - (instancetype)init:(NSObject<FlutterBinaryMessenger> *)messenger {
         dictionary];
     _callbackQueue =
         dispatch_queue_create("io.flutter.plugins.firebase.storage", DISPATCH_QUEUE_SERIAL);
-    hasEmulatorBooted = false;
+    _emulatorBooted = [[NSMutableDictionary alloc] init];
     _binaryMessenger = messenger;
     _eventChannels = [NSMutableDictionary dictionary];
     _streamHandlers = [NSMutableDictionary dictionary];
@@ -242,9 +242,11 @@ - (void)useStorageEmulatorApp:(PigeonStorageFirebaseApp *)app
                          port:(NSNumber *)port
                    completion:(void (^)(FlutterError *_Nullable))completion {
   FIRStorage *storage = [self getFIRStorageFromAppNameFromPigeon:app];
-  if (hasEmulatorBooted == false) {
+  NSNumber *emulatorKey = _emulatorBooted[app.bucket];
+
+  if (emulatorKey == nil) {
     [storage useEmulatorWithHost:host port:[port integerValue]];
-    hasEmulatorBooted = true;
+    [_emulatorBooted setObject:@(YES) forKey:app.bucket];
   }
   completion(nil);
 }