From 0b815235976bfbe89755bbf6f55aa9ee09f4b1c7 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael.code@endoftheworl.de>
Date: Wed, 22 Mar 2017 15:03:04 -0400
Subject: [PATCH] Clearer logging and added an assert per CR

// FREEBIE
---
 Signal/src/util/DisplayableTextFilter.swift | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Signal/src/util/DisplayableTextFilter.swift b/Signal/src/util/DisplayableTextFilter.swift
index db907ec8c..90b97bc46 100644
--- a/Signal/src/util/DisplayableTextFilter.swift
+++ b/Signal/src/util/DisplayableTextFilter.swift
@@ -15,7 +15,10 @@ import Foundation
         }
 
         if (self.hasExcessiveDiacriticals(text: text)) {
-            return text.folding(options: .diacriticInsensitive, locale: .current)
+            Logger.warn("\(TAG) filtering text for excessive diacriticals.")
+            let filteredText = text.folding(options: .diacriticInsensitive, locale: .current)
+            assert(!self.hasExcessiveDiacriticals(filteredText))
+            return filteredText
         }
 
         return text
@@ -26,7 +29,7 @@ import Foundation
         for char in text.characters.enumerated() {
             let scalarCount = String(char.element).unicodeScalars.count
             if scalarCount > 4 {
-                Logger.warn("\(TAG) filtering undisplayable text \(char.element) scalarCount: \(scalarCount)")
+                Logger.warn("\(TAG) detected excessive diacriticals at \(char.element) scalarCount: \(scalarCount)")
                 return true
             }
         }