From 5888f1ba44ff382e50193ef76460049acc5c4ab8 Mon Sep 17 00:00:00 2001
From: Ryan Lue <hello@ryanlue.com>
Date: Wed, 22 Aug 2018 10:51:41 +0800
Subject: [PATCH] Preliminary fix per code review [skip ci]

---
 lib/import/exchange/folder.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/import/exchange/folder.rb b/lib/import/exchange/folder.rb
index c442179dd..0a32ebf6a 100644
--- a/lib/import/exchange/folder.rb
+++ b/lib/import/exchange/folder.rb
@@ -43,7 +43,7 @@ module Import
       end
 
       def display_path(folder)
-        display_name  = folder.display_name.utf8_encode(fallback: :read_as_sanitized_binary)
+        display_name  = folder.display_name.utf8_encode
         parent_folder = find(folder.parent_folder_id)
 
         return display_name if parent_folder.blank?
@@ -51,6 +51,8 @@ module Import
         "#{display_path(parent_folder)} -> #{display_name}"
       rescue Viewpoint::EWS::EwsError
         display_name
+      rescue EncodingError
+        '(undetectable encoding)'
       end
 
       private