From 7ff2347df1b2f17f0067def592ffb7cd2a06c580 Mon Sep 17 00:00:00 2001
From: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>
Date: Fri, 27 Feb 2026 14:32:27 +0200
Subject: [PATCH] Clean up

---
 .../SettingsService.TokenEncryptionConverter.cs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/DiscordChatExporter.Gui/Services/SettingsService.TokenEncryptionConverter.cs b/DiscordChatExporter.Gui/Services/SettingsService.TokenEncryptionConverter.cs
index bc7ef695..cdbddaff 100644
--- a/DiscordChatExporter.Gui/Services/SettingsService.TokenEncryptionConverter.cs
+++ b/DiscordChatExporter.Gui/Services/SettingsService.TokenEncryptionConverter.cs
@@ -85,14 +85,21 @@ public partial class SettingsService
 
             // Layout: nonce (12 bytes) | paddingLength (1 byte) | tag (16 bytes) | cipher (paddingLength + tokenData.Length)
             var data = new byte[29 + paddingLength + tokenData.Length];
-            RandomNumberGenerator.Fill(data.AsSpan(0, 12)); // nonce
+
+            // Nonce
+            RandomNumberGenerator.Fill(data.AsSpan(0, 12));
+
+            // Padding length
             data[12] = (byte)paddingLength;
-            var cipherSource = data.AsSpan(29);
-            RandomNumberGenerator.Fill(cipherSource[..paddingLength]); // random padding
-            tokenData.CopyTo(cipherSource[paddingLength..]); // token
+
+            // Padding
+            RandomNumberGenerator.Fill(data.AsSpan(29, paddingLength));
+
+            // Token data
+            tokenData.CopyTo(data.AsSpan(29 + paddingLength));
 
             using var aes = new AesGcm(Key.Value, 16);
-            aes.Encrypt(data.AsSpan(0, 12), cipherSource, cipherSource, data.AsSpan(13, 16));
+            aes.Encrypt(data.AsSpan(0, 12), data.AsSpan(29), data.AsSpan(29), data.AsSpan(13, 16));
 
             writer.WriteStringValue(Prefix + Convert.ToHexStringLower(data));
         }