From aa535247513b06804fce666fe20ebcc9bd231c1f Mon Sep 17 00:00:00 2001
From: smizrahi <seb.mizrahi@gmail.com>
Date: Mon, 20 Nov 2023 11:57:08 +0100
Subject: [PATCH] feat(mail): Add SOGoMailHideInlineAttachments option to hide
 attachments when inline. Fixes #5490. Fix default values in sogo.conf.

---
 SoObjects/SOGo/SOGoDefaults.plist     | 1 +
 UI/PreferencesUI/UIxJSONPreferences.m | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/SoObjects/SOGo/SOGoDefaults.plist b/SoObjects/SOGo/SOGoDefaults.plist
index 0862ed18e..e5fde2443 100644
--- a/SoObjects/SOGo/SOGoDefaults.plist
+++ b/SoObjects/SOGo/SOGoDefaults.plist
@@ -123,6 +123,7 @@
     SOGoTemplatesFolderName = "Templates";
     SOGoMailComposeMessageType = "html";
     SOGoMailComposeFontSize = "0";
+    SOGoMailHideInlineAttachments = NO;
     SOGoMailDisplayRemoteInlineImages = "never";
     SOGoMailCertificateEnabled = YES;
 
diff --git a/UI/PreferencesUI/UIxJSONPreferences.m b/UI/PreferencesUI/UIxJSONPreferences.m
index 3af2fdc9c..75889851e 100644
--- a/UI/PreferencesUI/UIxJSONPreferences.m
+++ b/UI/PreferencesUI/UIxJSONPreferences.m
@@ -368,6 +368,9 @@ static SoProduct *preferencesProduct = nil;
   if ([[defaults source] objectForKey: @"SOGoMailAutoMarkAsReadDelay"] == nil)
     [[defaults source] setObject: [NSNumber numberWithInt: [defaults mailAutoMarkAsReadDelay]] forKey: @"SOGoMailAutoMarkAsReadDelay"];
 
+  if ([[defaults source] objectForKey: @"SOGoMailHideInlineAttachments"] == nil)
+    [[defaults source] setObject: [NSNumber numberWithBool: [defaults hideInlineAttachments]] forKey: @"SOGoMailHideInlineAttachments"];
+  
   if (![[defaults source] objectForKey: @"SOGoMailAutoSave"])
     [[defaults source] setObject: [defaults mailAutoSave] forKey: @"SOGoMailAutoSave"];