Dispatch getData callbacks on FRepo callback queue

FirebaseDatabase/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v8.5.0
+- [fixed] FirebaseDatabase `getData()` callbacks are now called on the main thread. (#8247)
+
 # v8.0.0
 - [added] Added abuse reduction features. (#7928, #7943)
 

FirebaseDatabase/Sources/Core/FRepo.m

@@ -525,11 +525,13 @@ - (void)getData:(FIRDatabaseQuery *)query
     FQuerySpec *querySpec = [query querySpec];
     id<FNode> node = [self.serverSyncTree getServerValue:[query querySpec]];
     if (node != nil) {
-        block(nil, [[FIRDataSnapshot alloc]
-                       initWithRef:query.ref
-                       indexedNode:[FIndexedNode
-                                       indexedNodeWithNode:node
-                                                     index:querySpec.index]]);
+        [self.eventRaiser raiseCallback:^{
+          block(nil, [[FIRDataSnapshot alloc]
+                         initWithRef:query.ref
+                         indexedNode:[FIndexedNode
+                                         indexedNodeWithNode:node
+                                                       index:querySpec.index]]);
+        }];
         return;
     }
     [self.persistenceManager setQueryActive:querySpec];
@@ -554,26 +556,33 @@ - (void)getData:(FIRDatabaseQuery *)query
                                @"and no matching disk cache entries",
                                querySpec]
                    };
-                   block([NSError errorWithDomain:kFirebaseCoreErrorDomain
-                                             code:1
-                                         userInfo:errorDict],
-                         nil);
+                   [self.eventRaiser raiseCallback:^{
+                     block([NSError errorWithDomain:kFirebaseCoreErrorDomain
+                                               code:1
+                                           userInfo:errorDict],
+                           nil);
+                   }];
                    return;
                }
-               block(nil, [[FIRDataSnapshot alloc] initWithRef:query.ref
-                                                   indexedNode:node]);
+               [self.eventRaiser raiseCallback:^{
+                 block(nil, [[FIRDataSnapshot alloc] initWithRef:query.ref
+                                                     indexedNode:node]);
+               }];
            } else {
                node = [FSnapshotUtilities nodeFrom:data];
                [self.eventRaiser
                    raiseEvents:[self.serverSyncTree
                                    applyServerOverwriteAtPath:[query path]
                                                       newData:node]];
-               block(nil,
+               [self.eventRaiser raiseCallback:^{
+                 block(
+                     nil,
                      [[FIRDataSnapshot alloc]
                          initWithRef:query.ref
                          indexedNode:[FIndexedNode
                                          indexedNodeWithNode:node
                                                        index:querySpec.index]]);
+               }];
            }
            [self.persistenceManager setQueryInactive:querySpec];
          }];

FirebaseDatabase/Tests/Integration/FIRDatabaseQueryTests.m

@@ -4121,6 +4121,19 @@ - (void)testGetForEmptyNodeReturnsNull {
   WAIT_FOR(done);
 }
 
+- (void)testGetInvokesCallbacksOnMainThread {
+  FIRDatabaseReference* ref = [FTestHelpers getRandomNode];
+
+  __block BOOL done = NO;
+
+  [ref getDataWithCompletionBlock:^(NSError* err, FIRDataSnapshot* snapshot) {
+    XCTAssert([[NSThread currentThread] isMainThread]);
+    done = YES;
+  }];
+
+  WAIT_FOR(done);
+}
+
 - (void)testGetForNodeReturnsCorrectValue {
   FIRDatabaseReference* ref = [FTestHelpers getRandomNode];