From 0ee3f0a5b5c188f880b155513d4bd96eaeb56f8f Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Tue, 23 Feb 2021 16:35:28 -0500
Subject: [PATCH] Fix a goof where the international unsealed sender country
 meter was incrementing unconditionally.

---
 .../textsecuregcm/controllers/MessageController.java         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
index e3f1c39ac..acb22329e 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
@@ -232,7 +232,10 @@ public class MessageController {
       if (source.isPresent() && !source.get().isFor(destinationName)) {
         rateLimiters.getMessagesLimiter().validate(source.get().getUuid() + "__" + destination.get().getUuid());
 
-        if (!Util.getCountryCode(source.get().getNumber()).equals(destination.get().getNumber())) {
+        final String senderCountryCode = Util.getCountryCode(source.get().getNumber());
+        final String destinationCountryCode = Util.getCountryCode(destination.get().getNumber());
+
+        if (!senderCountryCode.equals(destinationCountryCode)) {
           Metrics.counter(INTERNATIONAL_UNSEALED_SENDER_COUNTER_NAME, SENDER_COUNTRY_TAG_NAME, Util.getCountryCode(source.get().getNumber())).increment();
         }
       }