From e0af248e6f96efe7009915935407fc809eb774a9 Mon Sep 17 00:00:00 2001
From: Alex Barney <thealexbarney@gmail.com>
Date: Fri, 20 Aug 2021 13:36:14 -0700
Subject: Clean the SD card save directory when opening the emulator (#2564)

Cleans "sdcard:/Nintendo/save" and deletes "sdcard:/save" when opening the emulator.

Works around invalid encryption when keys or the SD card encryption seed are changed.
---
 .../FileSystem/EncryptedFileSystemCreator.cs       | 35 +---------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

(limited to 'Ryujinx.HLE/FileSystem/EncryptedFileSystemCreator.cs')

diff --git a/Ryujinx.HLE/FileSystem/EncryptedFileSystemCreator.cs b/Ryujinx.HLE/FileSystem/EncryptedFileSystemCreator.cs
index aaa80044..f8e59fb5 100644
--- a/Ryujinx.HLE/FileSystem/EncryptedFileSystemCreator.cs
+++ b/Ryujinx.HLE/FileSystem/EncryptedFileSystemCreator.cs
@@ -9,8 +9,6 @@ namespace Ryujinx.HLE.FileSystem
 {
     public class EncryptedFileSystemCreator : IEncryptedFileSystemCreator
     {
-        public EncryptedFileSystemCreator() { }
-
         public Result Create(out ReferenceCountedDisposable<IFileSystem> encryptedFileSystem, ReferenceCountedDisposable<IFileSystem> baseFileSystem,
             EncryptedFsKeyId keyId, in EncryptionSeed encryptionSeed)
         {
@@ -23,40 +21,9 @@ namespace Ryujinx.HLE.FileSystem
 
             // Force all-zero keys for now since people can open the emulator with different keys or sd seeds sometimes
             var fs = new AesXtsFileSystem(baseFileSystem, new byte[0x32], 0x4000);
-            var aesFileSystem = new ReferenceCountedDisposable<IFileSystem>(fs);
-
-            // This wrapper will handle deleting files that were created with different keys
-            var wrappedFs = new ChangedEncryptionHandlingFileSystem(aesFileSystem);
-            encryptedFileSystem = new ReferenceCountedDisposable<IFileSystem>(wrappedFs);
+            encryptedFileSystem = new ReferenceCountedDisposable<IFileSystem>(fs);
 
             return Result.Success;
         }
     }
-
-    public class ChangedEncryptionHandlingFileSystem : ForwardingFileSystem
-    {
-        public ChangedEncryptionHandlingFileSystem(ReferenceCountedDisposable<IFileSystem> baseFileSystem) : base(baseFileSystem) { }
-
-        protected override Result DoOpenFile(out IFile file, U8Span path, OpenMode mode)
-        {
-            UnsafeHelpers.SkipParamInit(out file);
-
-            try
-            {
-                return base.DoOpenFile(out file, path, mode);
-            }
-            catch (HorizonResultException ex)
-            {
-                if (ResultFs.AesXtsFileHeaderInvalidKeys.Includes(ex.ResultValue))
-                {
-                    Result rc = DeleteFile(path);
-                    if (rc.IsFailure()) return rc;
-
-                    return base.DoOpenFile(out file, path, mode);
-                }
-
-                throw;
-            }
-        }
-    }
 }
-- 
cgit v1.2.3