Fix token fetch not invoking callback for unchanged token (#3251)

morganchen12 · wilhuff · commit 390966620a28 · 2019-09-26T12:02:04.000-07:00
diff --git a/Firestore/Swift/Source/Codable/third_party/FirestoreEncoder.swift b/Firestore/Swift/Source/Codable/third_party/FirestoreEncoder.swift
@@ -36,7 +36,7 @@ extension Firestore {
     ///            API can work with.
     public func encode<T: Encodable>(_ value: T) throws -> [String: Any] {
       // DocumentReference and FieldValue cannot be encoded directly.
-      guard T.self != DocumentReference.self && T.self != FieldValue.self else {
+      guard T.self != DocumentReference.self, T.self != FieldValue.self else {
         throw FirestoreEncodingError.encodingIsNotSupported
       }
       guard let topLevel = try _FirestoreEncoder().box_(value) else {
diff --git a/Firestore/third_party/FirestoreEncoder/FirestoreEncoder.swift b/Firestore/third_party/FirestoreEncoder/FirestoreEncoder.swift
@@ -36,7 +36,7 @@ extension Firestore {
     ///            API can work with.
     public func encode<T: Encodable>(_ value: T) throws -> [String: Any] {
       // DocumentReference and FieldValue cannot be encoded directly.
-      guard T.self != DocumentReference.self && T.self != FieldValue.self else {
+      guard T.self != DocumentReference.self, T.self != FieldValue.self else {
         throw FirestoreEncodingError.encodingIsNotSupported
       }
       guard let topLevel = try _FirestoreEncoder().box_(value) else {

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ extension Firestore {`
`36`	`36`	`/// API can work with.`
`37`	`37`	`public func encode<T: Encodable>(_ value: T) throws -> [String: Any] {`
`38`	`38`	`// DocumentReference and FieldValue cannot be encoded directly.`
`39`		`- guard T.self != DocumentReference.self && T.self != FieldValue.self else {`
	`39`	`+ guard T.self != DocumentReference.self, T.self != FieldValue.self else {`
`40`	`40`	`throw FirestoreEncodingError.encodingIsNotSupported`
`41`	`41`	`}`
`42`	`42`	`guard let topLevel = try _FirestoreEncoder().box_(value) else {`