From 389b439e9a8e299c54895a2f435140046d587cf0 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 11 Aug 2023 11:30:36 -0400
Subject: [PATCH] Log ServiceId parsing failures.

---
 .../org/whispersystems/signalservice/api/push/ServiceId.kt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/ServiceId.kt b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/ServiceId.kt
index 4fbce5d5ae..66eec56015 100644
--- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/ServiceId.kt
+++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/ServiceId.kt
@@ -3,6 +3,7 @@ package org.whispersystems.signalservice.api.push
 import com.google.protobuf.ByteString
 import org.signal.libsignal.protocol.ServiceId.InvalidServiceIdException
 import org.signal.libsignal.protocol.SignalProtocolAddress
+import org.signal.libsignal.protocol.logging.Log
 import org.whispersystems.signalservice.api.util.UuidUtil
 import java.lang.IllegalArgumentException
 import java.util.UUID
@@ -21,6 +22,8 @@ import org.signal.libsignal.protocol.ServiceId.Pni as LibSignalPni
  */
 sealed class ServiceId(val libSignalServiceId: LibSignalServiceId) {
   companion object {
+    private const val TAG = "ServiceId"
+
     @JvmStatic
     fun fromLibSignal(serviceId: LibSignalServiceId): ServiceId {
       return when (serviceId) {
@@ -40,8 +43,10 @@ sealed class ServiceId(val libSignalServiceId: LibSignalServiceId) {
       return try {
         fromLibSignal(LibSignalServiceId.parseFromString(raw))
       } catch (e: IllegalArgumentException) {
+        Log.w(TAG, "[parseOrNull(String)] Illegal argument!", e)
         null
       } catch (e: InvalidServiceIdException) {
+        Log.w(TAG, "[parseOrNull(String)] Invalid ServiceId!", e)
         null
       }
     }
@@ -60,8 +65,10 @@ sealed class ServiceId(val libSignalServiceId: LibSignalServiceId) {
           fromLibSignal(LibSignalServiceId.parseFromBinary(raw))
         }
       } catch (e: IllegalArgumentException) {
+        Log.w(TAG, "[parseOrNull(Bytes)] Illegal argument!", e)
         null
       } catch (e: InvalidServiceIdException) {
+        Log.w(TAG, "[parseOrNull(Bytes)] Invalid ServiceId!", e)
         null
       }
     }