Refactor recent emojis saving

Author: FrayxRulez

Telegram/Controls/Chats/ChatTextFlyout.xaml.cs

@@ -142,13 +142,12 @@ void InsertText(string insert)
             if (e.ClickedItem is EmojiData emoji)
             {
                 SettingsService.Current.Emoji.AddRecentEmoji(emoji.Value);
-                SettingsService.Current.Emoji.SortRecentEmoji();
-                SettingsService.Current.Emoji.SaveRecentEmoji();
-
                 InsertText($"{emoji.Value}");
             }
             else if (e.ClickedItem is Sticker sticker && sticker.FullType is StickerFullTypeCustomEmoji customEmoji)
             {
+                SettingsService.Current.Emoji.AddRecentEmoji($"{sticker.Emoji};{customEmoji.CustomEmojiId}");
+
                 var range = _textBox.Document.GetRange(index, _textBox.Document.Selection.StartPosition);
 
                 _textBox.InsertEmoji(range, sticker.Emoji, customEmoji.CustomEmojiId);

Telegram/Controls/Drawers/EmojiDrawer.xaml.cs

@@ -348,9 +348,6 @@ private async void ListView_ItemClick(object sender, ItemClickEventArgs e)
                 _needUpdate = true;
 
                 SettingsService.Current.Emoji.AddRecentEmoji(data.Value);
-                SettingsService.Current.Emoji.SortRecentEmoji();
-                SettingsService.Current.Emoji.SaveRecentEmoji();
-
                 ItemClick?.Invoke(this, e);
             }
             else if (e.ClickedItem is StickerViewModel sticker)
@@ -381,8 +378,6 @@ private async void ListView_ItemClick(object sender, ItemClickEventArgs e)
                     if (sticker.FullType is StickerFullTypeCustomEmoji customEmoji)
                     {
                         SettingsService.Current.Emoji.AddRecentEmoji($"{sticker.Emoji};{customEmoji.CustomEmojiId}");
-                        SettingsService.Current.Emoji.SortRecentEmoji();
-                        SettingsService.Current.Emoji.SaveRecentEmoji();
                     }
 
                     ItemClick?.Invoke(this, e);

Telegram/Services/Settings/EmojiSettings.cs

@@ -5,9 +5,7 @@
 // file LICENSE or copy at https://www.gnu.org/licenses/gpl-3.0.txt)
 //
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using Telegram.Common;
 
 namespace Telegram.Services.Settings
 {
@@ -24,6 +22,7 @@ public partial class EmojiSettings : SettingsServiceBase
 
         private readonly Dictionary<string, int> _emojiUseHistory = new Dictionary<string, int>();
         private readonly List<string> _recentEmoji = new List<string>();
+        private readonly object _recentEmojiLock = new();
         private bool _recentEmojiLoaded;
 
         private const int MAX_RECENT_EMOJI_COUNT = 35;
@@ -37,40 +36,42 @@ public List<string> RecentEmoji
         {
             get
             {
-                LoadRecentEmoji();
-                return _recentEmoji;
+                lock (_recentEmojiLock)
+                {
+                    LoadRecentEmoji();
+                    return _recentEmoji;
+                }
             }
         }
 
-
-        public EmojiData[] GetRecentEmoji()
-        {
-            LoadRecentEmoji();
-            return _recentEmoji.Select(x => new EmojiData(x)).ToArray();
-        }
-
         public void AddRecentEmoji(string code)
         {
-            LoadRecentEmoji();
-
-            foreach (var modifier in _modifiers)
+            lock (_recentEmojiLock)
             {
-                code = code.Replace(modifier, string.Empty);
-            }
+                LoadRecentEmoji();
 
-            _emojiUseHistory.TryGetValue(code, out int count);
+                foreach (var modifier in _modifiers)
+                {
+                    code = code.Replace(modifier, string.Empty);
+                }
 
-            if (count == 0 && _emojiUseHistory.Count >= MAX_RECENT_EMOJI_COUNT)
-            {
-                var emoji = _recentEmoji[_recentEmoji.Count - 1];
-                _emojiUseHistory.Remove(emoji);
-                _recentEmoji[_recentEmoji.Count - 1] = code;
-            }
+                _emojiUseHistory.TryGetValue(code, out int count);
+
+                if (count == 0 && _emojiUseHistory.Count >= MAX_RECENT_EMOJI_COUNT)
+                {
+                    var emoji = _recentEmoji[_recentEmoji.Count - 1];
+                    _emojiUseHistory.Remove(emoji);
+                    _recentEmoji[_recentEmoji.Count - 1] = code;
+                }
+
+                _emojiUseHistory[code] = ++count;
 
-            _emojiUseHistory[code] = ++count;
+                SortRecentEmoji();
+                SaveRecentEmoji();
+            }
         }
 
-        public void SortRecentEmoji()
+        private void SortRecentEmoji()
         {
             _recentEmoji.Clear();
 
@@ -102,7 +103,7 @@ public void SortRecentEmoji()
             }
         }
 
-        public void SaveRecentEmoji()
+        private void SaveRecentEmoji()
         {
             var stringBuilder = new StringBuilder();
 
@@ -130,7 +131,7 @@ public void ClearRecentEmoji()
             SaveRecentEmoji();
         }
 
-        public void LoadRecentEmoji()
+        private void LoadRecentEmoji()
         {
             if (_recentEmojiLoaded)
             {