Removed redundant cache clear

Author: d2dyno1

src/Core/SecureFolderFS.Core.FileSystem/Chunks/CachingChunkAccess.cs

@@ -111,8 +111,6 @@ public override void Flush()
                     if (item.Value.WasModified)
                         chunkWriter.WriteChunk(item.Key, item.Value.Buffer.AsSpan(0, item.Value.ActualLength));
                 }
-
-                _chunkCache.Clear();
             }
         }
 

src/Core/SecureFolderFS.Core.FileSystem/Chunks/ChunkAccess.cs

@@ -35,7 +35,7 @@ public ChunkAccess(ChunkReader chunkReader, ChunkWriter chunkWriter, IContentCry
         /// <param name="chunkNumber">The number of chunk to copy from.</param>
         /// <param name="destination">The destination buffer to copy to.</param>
         /// <param name="offsetInChunk">The offset in chunk to start copying from.</param>
-        /// <returns>The amount of bytes copied. If successful, value is non-negative.</returns>
+        /// <returns>The number of bytes copied. If successful, value is non-negative.</returns>
         public virtual int CopyFromChunk(long chunkNumber, Span<byte> destination, int offsetInChunk)
         {
             // Rent buffer
@@ -74,7 +74,7 @@ public virtual int CopyFromChunk(long chunkNumber, Span<byte> destination, int o
         /// <param name="chunkNumber">The number of chunk to copy to.</param>
         /// <param name="source">The source buffer to copy from.</param>
         /// <param name="offsetInChunk">The offset in chunk to start copying to.</param>
-        /// <returns>The amount of bytes copied. If successful, value is non-negative.</returns>
+        /// <returns>The number of bytes copied. If successful, value is non-negative.</returns>
         public virtual int CopyToChunk(long chunkNumber, ReadOnlySpan<byte> source, int offsetInChunk)
         {
             // Rent buffer

src/Core/SecureFolderFS.Core.FileSystem/Chunks/ChunkReader.cs

@@ -33,7 +33,7 @@ public ChunkReader(Security security, BufferHolder fileHeader, StreamsManager st
         /// </summary>
         /// <param name="chunkNumber">The chunk number to read at.</param>
         /// <param name="plaintextChunk">The plaintext chunk to write to.</param>
-        /// <returns>The amount of plaintext bytes or -1 if integrity error occurred.</returns>
+        /// <returns>The number of plaintext bytes or -1 if integrity error occurred.</returns>
         public int ReadChunk(long chunkNumber, Span<byte> plaintextChunk)
         {
             // Calculate sizes
@@ -67,7 +67,7 @@ public int ReadChunk(long chunkNumber, Span<byte> plaintextChunk)
                 // Read from stream at correct chunk
                 var read = ciphertextStream.Read(realCiphertextChunk);
 
-                // Check for end of file
+                // Check for the end of the file
                 if (read == FileSystem.Constants.FILE_EOF)
                     return 0;
 

src/Core/SecureFolderFS.Core.FileSystem/Streams/PlaintextStream.cs

@@ -170,7 +170,7 @@ public override void SetLength(long value)
             if (value == Length)
                 return;
 
-            // Make sure header is ready before we can read/modify chunks
+            // Make sure the header is ready before we can read/modify chunks
             if (!TryWriteHeader() && !_headerBuffer.ReadHeader(Inner, _security))
                 throw new CryptographicException();
 
@@ -191,7 +191,7 @@ public override void SetLength(long value)
             }
             else if (value > Length)
             {
-                // Flush remaining chunks before base stream is accessed
+                // Flush remaining chunks before the base stream is accessed
                 _chunkAccess.Flush();
 
                 // Calculate plaintext size here because plaintext Length might not be initialized yet
@@ -259,6 +259,9 @@ public override void Close()
         /// <inheritdoc/>
         public override void Flush()
         {
+            if (!CanWrite)
+                throw FileSystemExceptions.StreamReadOnly;
+
             // Only flush when there's a need to
             if (_chunkAccess.FlushAvailable)
             {
@@ -270,7 +273,7 @@ public override void Flush()
         private void WriteInternal(ReadOnlySpan<byte> buffer, long position)
         {
             if (!TryWriteHeader() && !_headerBuffer.ReadHeader(Inner, _security))
-                throw new CryptographicException();
+                throw new CryptographicException("Could not write nor read the header.");
 
             var plaintextChunkSize = _security.ContentCrypt.ChunkPlaintextSize;
             var written = 0;
@@ -282,7 +285,6 @@ private void WriteInternal(ReadOnlySpan<byte> buffer, long position)
                 var chunkNumber = currentPosition / plaintextChunkSize;
                 var offsetInChunk = (int)(currentPosition % plaintextChunkSize);
                 var length = Math.Min(buffer.Length - positionInBuffer, plaintextChunkSize - offsetInChunk);
-
                 var copy = _chunkAccess.CopyToChunk(
                     chunkNumber,
                     buffer.Slice(positionInBuffer),
@@ -309,43 +311,40 @@ private void WriteInternal(ReadOnlySpan<byte> buffer, long position)
         [SkipLocalsInit]
         private bool TryWriteHeader()
         {
-            if (!CanWrite)
-                throw FileSystemExceptions.StreamReadOnly;
+            if (_headerBuffer.IsHeaderReady)
+                return true;
 
             lock (_writeLock)
-                if (!_headerBuffer.IsHeaderReady && CanWrite)
+            {
+                // Check if there is data already written only when we can seek
+                if (Inner.Length > 0L)
+                    return false;
+
+                // Make sure we save the header state
+                _headerBuffer.IsHeaderReady = true;
+
+                // Allocate ciphertext header
+                Span<byte> ciphertextHeader = stackalloc byte[_security.HeaderCrypt.HeaderCiphertextSize];
+
+                // Get and encrypt the header
+                _security.HeaderCrypt.CreateHeader(_headerBuffer);
+                _security.HeaderCrypt.EncryptHeader(_headerBuffer, ciphertextHeader);
+
+                // Write header
+                if (CanSeek)
                 {
-                    // Check if there is data already written only when we can seek
-                    if (Inner.Length > 0L)
-                        return false;
-
-                    // Make sure we save the header state
-                    _headerBuffer.IsHeaderReady = true;
-
-                    // Allocate ciphertext header
-                    Span<byte> ciphertextHeader = stackalloc byte[_security.HeaderCrypt.HeaderCiphertextSize];
-
-                    // Get and encrypt the header
-                    _security.HeaderCrypt.CreateHeader(_headerBuffer);
-                    _security.HeaderCrypt.EncryptHeader(_headerBuffer, ciphertextHeader);
-
-                    // Write header
-                    if (CanSeek)
-                    {
-                        var savedPosition = Inner.Position;
-                        Inner.Position = 0L;
-                        Inner.Write(ciphertextHeader);
-                        Inner.Position = savedPosition + ciphertextHeader.Length;
-                    }
-                    else
-                    {
-                        Inner.Write(ciphertextHeader);
-                    }
-
-                    return true;
+                    var savedPosition = Inner.Position;
+                    Inner.Position = 0L;
+                    Inner.Write(ciphertextHeader);
+                    Inner.Position = savedPosition + ciphertextHeader.Length;
+                }
+                else
+                {
+                    Inner.Write(ciphertextHeader);
                 }
 
-            return false;
+                return true;
+            }
         }
 
         private long AlignToChunkStartPosition(long plaintextPosition)

src/Platforms/Directory.Packages.props

@@ -4,7 +4,6 @@
     <PackageVersion Include="AathifMahir.Maui.MauiIcons.Material" Version="4.0.0" />
     <PackageVersion Include="AcrylicView.Maui" Version="2.1.3" />
     <PackageVersion Include="CommunityToolkit.Maui" Version="11.2.0" />
-    <PackageVersion Include="CommunityToolkit.Maui.MediaElement" Version="6.0.2" />
     <PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.2.250402" />
     <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.Markdown" Version="7.1.2" />
     <PackageVersion Include="ContextMenuContainer" Version="1.2.3" />
@@ -21,7 +20,7 @@
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
     <PackageVersion Include="Octokit" Version="14.0.0" />
     <PackageVersion Include="Plugin.Maui.BottomSheet" Version="9.1.4" />
-    <PackageVersion Include="Sentry" Version="5.12.0" />
+    <PackageVersion Include="Sentry" Version="5.16.0" />
     <PackageVersion Include="SkiaSharp" Version="3.119.0" />
     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.4" />
     <PackageVersion Include="Uno.CommunityToolkit.WinUI" Version="7.1.200" />

src/Platforms/SecureFolderFS.Maui/MauiProgram.cs

@@ -26,7 +26,6 @@ public static MauiApp CreateMauiApp()
                 })
 
                 // Plugins
-                .UseMauiCommunityToolkitMediaElement()  // https://github.com/CommunityToolkit/Maui
                 .UseMauiCommunityToolkit()              // https://github.com/CommunityToolkit/Maui
                 .UseBottomSheet()                       // https://github.com/lucacivale/Maui.BottomSheet
                 .ConfigureContextMenuContainer()        // https://github.com/anpin/ContextMenuContainer

src/Platforms/SecureFolderFS.Maui/Popups/CredentialsPopup.xaml

@@ -32,7 +32,8 @@
                     Clicked="ResetViewButton_Click"
                     HorizontalOptions="Fill"
                     IsEnabled="{Binding ViewModel.CanContinue, Mode=OneWay, Source={x:Reference ThisPopup}}"
-                    Style="{StaticResource AccentButtonStyle}"
+                    Style="{OnPlatform Android={StaticResource AccentButtonStyle},
+                                       iOS={StaticResource NoBackgroundButtonStyle}}"
                     Text="{Binding ViewModel.PrimaryText, Mode=OneWay, Source={x:Reference ThisPopup}}" />
             </VerticalStackLayout>
         </DataTemplate>

src/Platforms/SecureFolderFS.Maui/Views/Modals/Vault/FilePreviewModalPage.xaml.cs

@@ -1,8 +1,6 @@
-using CommunityToolkit.Maui.Views;
 using LibVLCSharp.MAUI;
 using LibVLCSharp.Shared;
 using SecureFolderFS.Maui.Extensions;
-using SecureFolderFS.Maui.Prompts;
 using SecureFolderFS.Maui.TemplateSelectors;
 using SecureFolderFS.Maui.UserControls;
 using SecureFolderFS.Maui.UserControls.Common;
@@ -88,14 +86,6 @@ protected override async void OnDisappearing()
                 (GalleryView.Next as IDisposable)?.Dispose();
             }
 
-            if ((Presentation.Content as ContentView)?.Content is MediaElement mediaElement)
-            {
-                mediaElement.Stop();
-                mediaElement.Handler?.DisconnectHandler();
-                mediaElement.Dispose();
-                mediaElement.Source = null;
-            }
-
             if (ViewModel?.PreviewerViewModel is TextPreviewerViewModel { WasModified: true } textViewModel)
             {
                 var overlayService = DI.Service<IOverlayService>();

src/Sdk/SecureFolderFS.Sdk.Ftp/SecureFolderFS.Sdk.Ftp.csproj

@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="FluentFTP" Version="53.0.1" />
+      <PackageReference Include="FluentFTP" Version="53.0.2" />
     </ItemGroup>
 
     <ItemGroup>

src/Shared/SecureFolderFS.Shared/SecureFolderFS.Shared.csproj

@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
-    <PackageReference Include="OwlCore.Storage" Version="0.12.3" />
+    <PackageReference Include="OwlCore.Storage" Version="0.14.0" />
     <PackageReference Include="MimeTypeMapOfficial" Version="1.0.17" />
   </ItemGroup>