FIRStorage.callbackQueue fixes (#4281)

maksymmalyhin · web-flow · commit a3197cc8cd4d · 2019-11-11T14:15:09.000-05:00
diff --git a/Firebase/Storage/FIRStorage.m b/Firebase/Storage/FIRStorage.m
@@ -170,7 +170,7 @@ - (instancetype)copyWithZone:(NSZone *)zone {
   FIRStorage *storage = [[[self class] allocWithZone:zone] initWithApp:_app
                                                                 bucket:_storageBucket
                                                                   auth:_auth];
-  storage.callbackQueue = _callbackQueue;
+  storage.callbackQueue = self.callbackQueue;
   return storage;
 }
 
@@ -195,7 +195,7 @@ - (BOOL)isEqualToFIRStorage:(FIRStorage *)storage {
 }
 
 - (NSUInteger)hash {
-  NSUInteger hash = [_app hash] ^ [_callbackQueue hash];
+  NSUInteger hash = [_app hash] ^ [self.callbackQueue hash];
   return hash;
 }
 
@@ -236,6 +236,10 @@ - (FIRStorageReference *)referenceWithPath:(NSString *)string {
   return reference;
 }
 
+- (dispatch_queue_t)callbackQueue {
+  return _fetcherServiceForApp.callbackQueue;
+}
+
 - (void)setCallbackQueue:(dispatch_queue_t)callbackQueue {
   _fetcherServiceForApp.callbackQueue = callbackQueue;
 }

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ - (instancetype)copyWithZone:(NSZone *)zone {`
`170`	`170`	`FIRStorage *storage = [[[self class] allocWithZone:zone] initWithApp:_app`
`171`	`171`	`bucket:_storageBucket`
`172`	`172`	`auth:_auth];`
`173`		`- storage.callbackQueue = _callbackQueue;`
	`173`	`+ storage.callbackQueue = self.callbackQueue;`
`174`	`174`	`return storage;`
`175`	`175`	`}`
`176`	`176`
`@@ -195,7 +195,7 @@ - (BOOL)isEqualToFIRStorage:(FIRStorage *)storage {`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`- (NSUInteger)hash {`
`198`		`- NSUInteger hash = [_app hash] ^ [_callbackQueue hash];`
	`198`	`+ NSUInteger hash = [_app hash] ^ [self.callbackQueue hash];`
`199`	`199`	`return hash;`
`200`	`200`	`}`
`201`	`201`
`@@ -236,6 +236,10 @@ - (FIRStorageReference )referenceWithPath:(NSString )string {`
`236`	`236`	`return reference;`
`237`	`237`	`}`
`238`	`238`
	`239`	`+- (dispatch_queue_t)callbackQueue {`
	`240`	`+ return _fetcherServiceForApp.callbackQueue;`
	`241`	`+}`
	`242`	`+`
`239`	`243`	`- (void)setCallbackQueue:(dispatch_queue_t)callbackQueue {`
`240`	`244`	`_fetcherServiceForApp.callbackQueue = callbackQueue;`
`241`	`245`	`}`