Skip to content

Commit ee41e57

Browse files
Fix warnings
1 parent 0485daf commit ee41e57

File tree

1 file changed

+21
-12
lines changed

1 file changed

+21
-12
lines changed

firebase-firestore/src/main/java/com/google/firebase/firestore/LoadBundleTask.java

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -489,24 +489,33 @@ private void removeOnProgressListener(
489489
}
490490

491491
void setResult(@Nullable LoadBundleTaskProgress result) {
492+
synchronized (lock) {
493+
snapshot = result;
494+
for (ManagedListener progressListener : progressListenerQueue) {
495+
progressListener.maybeRun(result);
496+
}
497+
progressListenerQueue.clear();
498+
}
492499
completionSource.setResult(result);
493-
updateProgress(result);
494-
progressListenerQueue.clear();
495500
}
496501

497502
void setException(@NonNull Exception exception) {
498-
LoadBundleTaskProgress lastSnapshot;
499503
synchronized (lock) {
500-
lastSnapshot = snapshot != null ? snapshot : LoadBundleTaskProgress.INITIAL;
504+
LoadBundleTaskProgress lastSnapshot =
505+
snapshot != null ? snapshot : LoadBundleTaskProgress.INITIAL;
506+
snapshot =
507+
new LoadBundleTaskProgress(
508+
lastSnapshot.getDocumentsLoaded(),
509+
lastSnapshot.getTotalDocuments(),
510+
lastSnapshot.getBytesLoaded(),
511+
lastSnapshot.getTotalBytes(),
512+
exception,
513+
LoadBundleTaskProgress.TaskState.ERROR);
514+
for (ManagedListener progressListener : progressListenerQueue) {
515+
progressListener.maybeRun(this.snapshot);
516+
}
517+
progressListenerQueue.clear();
501518
}
502-
updateProgress(
503-
new LoadBundleTaskProgress(
504-
lastSnapshot.getDocumentsLoaded(),
505-
lastSnapshot.getTotalDocuments(),
506-
lastSnapshot.getBytesLoaded(),
507-
lastSnapshot.getTotalBytes(),
508-
exception,
509-
LoadBundleTaskProgress.TaskState.ERROR));
510519
completionSource.setException(exception);
511520
}
512521

0 commit comments

Comments
 (0)