Always send the user agent regardless of the heartbeat value (#2012)

var-const · web-flow · commit 12ae453dc924 · 2020-09-29T13:57:25.000-04:00
Port of firebase/firebase-ios-sdk#6592
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/FirebaseClientGrpcMetadataProvider.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/remote/FirebaseClientGrpcMetadataProvider.java
@@ -60,12 +60,13 @@ public void updateMetadata(@NonNull Metadata metadata) {
     }
 
     int heartBeatCode = heartBeatInfoProvider.get().getHeartBeatCode(HEART_BEAT_TAG).getCode();
-    // Non-zero values indicate some kind of heartbeat should be sent
+    // Non-zero values indicate some kind of heartbeat should be sent.
     if (heartBeatCode != 0) {
       metadata.put(HEART_BEAT_HEADER, Integer.toString(heartBeatCode));
-      metadata.put(USER_AGENT_HEADER, userAgentPublisherProvider.get().getUserAgent());
-      maybeAddGmpAppId(metadata);
     }
+
+    metadata.put(USER_AGENT_HEADER, userAgentPublisherProvider.get().getUserAgent());
+    maybeAddGmpAppId(metadata);
   }
 
   private void maybeAddGmpAppId(@NonNull Metadata metadata) {

Original file line number	Diff line number	Diff line change
`@@ -60,12 +60,13 @@ public void updateMetadata(@NonNull Metadata metadata) {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`int heartBeatCode = heartBeatInfoProvider.get().getHeartBeatCode(HEART_BEAT_TAG).getCode();`
`63`		`- // Non-zero values indicate some kind of heartbeat should be sent`
	`63`	`+ // Non-zero values indicate some kind of heartbeat should be sent.`
`64`	`64`	`if (heartBeatCode != 0) {`
`65`	`65`	`metadata.put(HEART_BEAT_HEADER, Integer.toString(heartBeatCode));`
`66`		`- metadata.put(USER_AGENT_HEADER, userAgentPublisherProvider.get().getUserAgent());`
`67`		`- maybeAddGmpAppId(metadata);`
`68`	`66`	`}`
	`67`	`+`
	`68`	`+ metadata.put(USER_AGENT_HEADER, userAgentPublisherProvider.get().getUserAgent());`
	`69`	`+ maybeAddGmpAppId(metadata);`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`private void maybeAddGmpAppId(@NonNull Metadata metadata) {`