From ee1291c81674f5c3cc8873c19bd310a48a93adb2 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Wed, 9 Aug 2023 17:48:09 -0400 Subject: [PATCH] Improve logging of (ACI, PNI, E164) tuples. --- .../org/thoughtcrime/securesms/database/RecipientTable.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt index 5bb3ab287d..8797c8bafc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt @@ -460,7 +460,9 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da result = processPnpTuple(e164 = e164, pni = pni, aci = aci, pniVerified = pniVerified, changeSelf = changeSelf) if (result.operations.isNotEmpty() || result.requiredInsert) { - Log.i(TAG, "[getAndPossiblyMerge] ($aci, $pni, $e164) BreadCrumbs: ${result.breadCrumbs}, Operations: ${result.operations}, RequiredInsert: ${result.requiredInsert}, FinalId: ${result.finalId}") + val pniString = if (pni == null) "null" else if (aci == null && e164 == null) pni.toString() else "" + val e164String = if (e164 == null) "null" else if (aci == null && pni == null) e164 else "" + Log.i(TAG, "[getAndPossiblyMerge] ($aci, $pniString, $e164String) BreadCrumbs: ${result.breadCrumbs}, Operations: ${result.operations}, RequiredInsert: ${result.requiredInsert}, FinalId: ${result.finalId}") } db.setTransactionSuccessful()