fix(mail): fix type of SOGoMailComposeFontSize defaults

Alinto · Feb 10, 2022 · 3847b57 · 3847b57
1 parent 150fe70
commit 3847b57
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/SoObjects/SOGo/SOGoUserDefaults.h b/SoObjects/SOGo/SOGoUserDefaults.h
@@ -1,6 +1,6 @@
 /* SOGoUserDefaults.h - this file is part of SOGo
  *
- * Copyright (C) 2011-2021 Inverse inc.
+ * Copyright (C) 2011-2022 Inverse inc.
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -142,8 +142,8 @@ extern NSString *SOGoWeekStartFirstFullWeek;
 - (void) setMailComposeMessageType: (NSString *) newValue;
 - (NSString *) mailComposeMessageType;
 
-- (void) setMailComposeFontSize: (NSString *) newValue;
-- (NSString *) mailComposeFontSize;
+- (void) setMailComposeFontSize: (int) newValue;
+- (int) mailComposeFontSize;
 
 - (void) setMailDisplayRemoteInlineImages: (NSString *) newValue;
 - (NSString *) mailDisplayRemoteInlineImages;

diff --git a/SoObjects/SOGo/SOGoUserDefaults.m b/SoObjects/SOGo/SOGoUserDefaults.m
@@ -1,6 +1,6 @@
 /* SOGoUserDefaults.m - this file is part of SOGo
  *
- * Copyright (C) 2009-2021 Inverse inc.
+ * Copyright (C) 2009-2022 Inverse inc.
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -600,14 +600,14 @@ - (NSString *) mailComposeMessageType
   return [self stringForKey: @"SOGoMailComposeMessageType"];
 }
 
-- (void) setMailComposeFontSize: (NSString *) newValue
+- (void) setMailComposeFontSize: (int) newValue
 {
-  [self setObject: newValue forKey: @"SOGoMailComposeFontSize"];
+  [self setInteger: newValue forKey: @"SOGoMailComposeFontSize"];
 }
 
-- (NSString *) mailComposeFontSize
+- (int) mailComposeFontSize
 {
-  return [self stringForKey: @"SOGoMailComposeFontSize"];
+  return [self integerForKey: @"SOGoMailComposeFontSize"];
 }
 
 - (void) setMailDisplayRemoteInlineImages: (NSString *) newValue

diff --git a/UI/MailerUI/UIxMailEditor.m b/UI/MailerUI/UIxMailEditor.m
@@ -600,11 +600,12 @@ - (NSException *) _saveRequestInfo
 {
   NSDictionary *info;
   NSException *error;
-  NSString *fontSize, *content;
+  NSString *content;
   NGMimeType *mimeType;
   WORequest *request;
   SOGoDraftObject *co;
   SOGoUserDefaults *ud;
+  int fontSize;
 
   error = nil;
   request = [context request];
@@ -629,8 +630,8 @@ - (NSException *) _saveRequestInfo
           // Set a base font size if mail is HTML and user has set a default font-size
           ud = [[context activeUser] userDefaults];
           fontSize = [ud mailComposeFontSize];
-          if ([fontSize intValue] > 0)
-            content = [NSString stringWithFormat: @"<html><span style=\"font-size: %@px;\">%@</span></html>",
+          if (fontSize > 0)
+            content = [NSString stringWithFormat: @"<html><span style=\"font-size: %ipx;\">%@</span></html>",
                                 fontSize, text];
           else
             content = [NSString stringWithFormat: @"<html>%@</html>", text];