Added flatpak-specific build options

Directory.Build.props

@@ -5,7 +5,7 @@
 		<ImplicitUsings>disable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<Copyright>Copyright © Mihnea Rădulescu 2024</Copyright>
-		<AssemblyVersion>1.2024.09.09</AssemblyVersion>
+		<AssemblyVersion>1.2024.09.10</AssemblyVersion>
 		<Version>$(AssemblyVersion)</Version>
 		<DebugType>embedded</DebugType>
 	</PropertyGroup>

PasswordSecure.Test/PasswordSecure.Test.csproj

@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="FluentAssertions" Version="6.12.0" />
+        <PackageReference Include="FluentAssertions" Version="6.12.1" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
         <PackageReference Include="xunit" Version="2.9.0" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">

PasswordSecure/App.axaml.cs

@@ -1,3 +1,5 @@
+//#define FLATPAK_BUILD
+
 using Avalonia.Markup.Xaml;
 using PasswordSecure.Application.Providers;
 using PasswordSecure.Application.Services;
@@ -34,8 +36,16 @@ public override void OnFrameworkInitializationCompleted()
         IDataAccessService dataAccessServiceDecorated = new TaskDecoratorDataAccessService(
             dataAccessService);
 
+        IEncryptedDataFolderProvider encryptedDataFolderProvider;
+        #if FLATPAK_BUILD
+            encryptedDataFolderProvider = new FlatpakEncryptedDataFolderProvider();
+        #else
+            encryptedDataFolderProvider = new DefaultEncryptedDataFolderProvider();
+        #endif
+
         var mainWindow = new MainWindow();
-        var mainPresenter = new MainPresenter(dataAccessServiceDecorated, assemblyVersionProvider, mainWindow);
+        var mainPresenter = new MainPresenter(
+            dataAccessServiceDecorated, assemblyVersionProvider, encryptedDataFolderProvider, mainWindow);
 
         mainWindow.Show();
     }

PasswordSecure/Application/Providers/IEncryptedDataFolderProvider.cs

@@ -0,0 +1,6 @@
+namespace PasswordSecure.Application.Providers;
+
+public interface IEncryptedDataFolderProvider
+{
+    string GetEncryptedDataFolderPath();
+}

PasswordSecure/Infrastructure/Providers/DefaultEncryptedDataFolderProvider.cs

@@ -0,0 +1,9 @@
+using System;
+using PasswordSecure.Application.Providers;
+
+namespace PasswordSecure.Infrastructure.Providers;
+
+public class DefaultEncryptedDataFolderProvider : IEncryptedDataFolderProvider
+{
+    public string GetEncryptedDataFolderPath() => Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+}

PasswordSecure/Infrastructure/Providers/FlatpakEncryptedDataFolderProvider.cs

@@ -0,0 +1,23 @@
+using System;
+using System.IO;
+using PasswordSecure.Application.Providers;
+
+namespace PasswordSecure.Infrastructure.Providers;
+
+public class FlatpakEncryptedDataFolderProvider : IEncryptedDataFolderProvider
+{
+    public string GetEncryptedDataFolderPath()
+    {
+        var sandboxedApplicationPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)
+            .Replace("/config", string.Empty);
+
+        var encryptedDataFolderPath = Path.Combine(sandboxedApplicationPath, EncryptedDataFolderName);
+        return encryptedDataFolderPath;
+    }
+
+    #region Private
+
+    private const string EncryptedDataFolderName = "EncryptedData";
+
+    #endregion
+}

PasswordSecure/Presentation/MainPresenter.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Avalonia.Controls;
@@ -20,15 +19,13 @@ public class MainPresenter
 {
 	static MainPresenter()
 	{
-		EncryptedDataFolderPath = GetEncryptedDataFolderPath();
-		CreateEncryptedDataFolderIfNecessary();
-
 		EncryptedFileTypes = GetEncryptedFileTypes();
 	}
 
 	public MainPresenter(
 		IDataAccessService dataAccessService,
 		IAssemblyVersionProvider assemblyVersionProvider,
+		IEncryptedDataFolderProvider encryptedDataFolderProvider,
 		MainWindow mainWindow)
 	{
 		_dataAccessService = dataAccessService;
@@ -48,21 +45,23 @@ public MainPresenter(
 		_mainWindow.HelpMenuClicked += OnHelpMenuClicked;
 
 		_accessParams = new AccessParams();
+
+		_encryptedDataFolderPath = encryptedDataFolderProvider.GetEncryptedDataFolderPath();
 	}
 
 	#region Private
-
-	private static readonly string EncryptedDataFolderPath;
+
 	private static readonly IReadOnlyList<FilePickerFileType> EncryptedFileTypes;
 
-	private const string EncryptedDataFolderName = "PasswordSecure";
 	private const int MinimumMasterPasswordLength = 8;
-	
+
 	private readonly IDataAccessService _dataAccessService;
 	private readonly IAssemblyVersionProvider _assemblyVersionProvider;
 
 	private readonly MainWindow _mainWindow;
 	private readonly AccessParams _accessParams;
+
+	private readonly string _encryptedDataFolderPath;
 
 	private void OnVisualStateChanged(object? sender, EventArgs e) => _mainWindow.EnableControls();
 
@@ -320,29 +319,7 @@ private void ResetData()
 	}
 
 	private async Task<IStorageFolder?> GetEncryptedDataFolder()
-		=> await _mainWindow.StorageProvider.TryGetFolderFromPathAsync(EncryptedDataFolderPath);
-
-	private static string GetEncryptedDataFolderPath()
-	{
-		var userProfilePath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
-		var encryptedDataFolderPath = Path.Combine(userProfilePath, EncryptedDataFolderName);
-
-		return encryptedDataFolderPath;
-	}
-
-	private static void CreateEncryptedDataFolderIfNecessary()
-	{
-		try
-		{
-			if (!Directory.Exists(EncryptedDataFolderPath))
-			{
-				Directory.CreateDirectory(EncryptedDataFolderPath);
-			}
-		}
-		catch
-		{
-		}
-	}
+		=> await _mainWindow.StorageProvider.TryGetFolderFromPathAsync(_encryptedDataFolderPath);
 
 	private static IReadOnlyList<FilePickerFileType> GetEncryptedFileTypes()
 	{