From 6ecc15d2376c1784f9056ad3a3631b265dc86530 Mon Sep 17 00:00:00 2001
From: Patrick Simpson <p.simpson@etosis.com>
Date: Wed, 9 May 2018 14:21:07 +0300
Subject: [PATCH] [KOE-169] Added option to allow FileAs to be set by Outlook
 in GAB contacts

---
 .../AcaciaZPushPlugin/Features/GAB/FeatureGAB.cs          | 8 ++++++++
 .../AcaciaZPushPlugin/Features/GAB/GABHandler.cs          | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/GAB/FeatureGAB.cs b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/GAB/FeatureGAB.cs
index a1ca40e..bb3062e 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/GAB/FeatureGAB.cs
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/GAB/FeatureGAB.cs
@@ -254,6 +254,14 @@ namespace Acacia.Features.GAB
         }
         private static readonly BoolOption OPTION_SMTP_GROUPS_AS_CONTACTS = new BoolOption("SMTPGroupsAsContacts", false);
 
+        [AcaciaOption("If enabled, the FileAs field will be set to displayName. Otherwise, Outlook will create it.")]
+        public bool FileAsDisplayName
+        {
+            get { return GetOption(OPTION_FILE_AS_DISPLAY_NAME); }
+            set { SetOption(OPTION_FILE_AS_DISPLAY_NAME, value); }
+        }
+        private static readonly BoolOption OPTION_FILE_AS_DISPLAY_NAME = new BoolOption("FileAsDisplayName", false);
+
         #endregion
 
         #region Modification suppression
diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/GAB/GABHandler.cs b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/GAB/GABHandler.cs
index 8134dd3..be380aa 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/GAB/GABHandler.cs
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/GAB/GABHandler.cs
@@ -522,7 +522,8 @@ namespace Acacia.Features.GAB
                 if (Get<string>(value, "title") != null) contact.JobTitle = Get<string>(value, "title");
                 if (Get<string>(value, "displayName") != null)
                 {
-                    contact.FileAs = Get<string>(value, "displayName");
+                    if (_feature.FileAsDisplayName)
+                        contact.FileAs = Get<string>(value, "displayName");
                     contact.FullName = Get<string>(value, "displayName");
                 }