Minor improvements

Author: d2dyno1

src/Core/SecureFolderFS.Core.Dokany/AppModels/DokanyOptions.cs

@@ -16,6 +16,12 @@ public sealed class DokanyOptions : VirtualFileSystemOptions
         /// </summary>
         public string? MountPoint { get => _mountPoint; init => _mountPoint = value; }
 
+        /// <inheritdoc/>
+        public override string? GetDescription()
+        {
+            return MountPoint;
+        }
+
         internal void DangerousSetMountPoint(string? value) => _mountPoint = value;
 
         public static DokanyOptions ToOptions(IDictionary<string, object> options)

src/Core/SecureFolderFS.Core.FUSE/AppModels/FuseOptions.cs

@@ -10,7 +10,7 @@ public sealed class FuseOptions : VirtualFileSystemOptions
         /// <summary>
         /// Gets the path where the file system should be mounted. If a null value is given, default mount point will be used.
         /// </summary>
-        public string? MountPoint { get; init; } = null;
+        public string? MountPoint { get; init; }
 
         /// <summary>
         /// Gets whether the root user should have access to the filesystem.
@@ -43,6 +43,12 @@ public sealed class FuseOptions : VirtualFileSystemOptions
         /// </summary>
         public bool PrintDebugInformation { get; init; } // TODO: Use ILogger in the base class
 
+        /// <inheritdoc/>
+        public override string? GetDescription()
+        {
+            return MountPoint;
+        }
+
         public static FuseOptions ToOptions(IDictionary<string, object> options)
         {
             return new()

src/Platforms/SecureFolderFS.UI/Helpers/BaseLifecycleHelper.cs

@@ -68,6 +68,7 @@ protected virtual IServiceCollection ConfigureServices(IModifiableFolder setting
                     .Foundation<IVaultPersistenceService, VaultPersistenceService>(AddService.AddSingleton, _ => new VaultPersistenceService(settingsFolder))
 #if DEBUG
                     .Foundation<ITelemetryService, DebugTelemetryService>(AddService.AddSingleton)
+                    //.Foundation<ITelemetryService, SentryTelemetryService>(AddService.AddSingleton)
 #else
                     .Foundation<ITelemetryService, SentryTelemetryService>(AddService.AddSingleton)
 #endif

src/Platforms/SecureFolderFS.UI/ServiceImplementation/BaseApplicationService.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -32,8 +32,8 @@ public virtual Version AppVersion
         /// <inheritdoc/>
         public virtual async IAsyncEnumerable<LicenseViewModel> GetLicensesAsync([EnumeratorCancellation] CancellationToken cancellationToken = default)
         {
-            var assembly = AppDomain.CurrentDomain.GetAssemblies().SingleOrDefault(x => x.GetName().Name == "SecureFolderFS.UI")!;
-            foreach (var item in assembly.GetManifestResourceNames().Where(resource => resource.StartsWith("SecureFolderFS.UI.Assets.Licenses")))
+            var assembly = AppDomain.CurrentDomain.GetAssemblies().SingleOrDefault(x => x.GetName().Name == $"{nameof(SecureFolderFS)}.{nameof(UI)}");
+            foreach (var item in assembly.GetManifestResourceNames().Where(resource => resource.StartsWith($"{nameof(SecureFolderFS)}.{nameof(UI)}.Assets.Licenses")))
             {
                 await using var stream = assembly.GetManifestResourceStream(item);
                 if (stream is null)

src/Platforms/SecureFolderFS.UI/ServiceImplementation/DebugTelemetryService.cs

@@ -1,6 +1,7 @@
-using SecureFolderFS.Sdk.Services;
 using System;
 using System.Threading.Tasks;
+using SecureFolderFS.Sdk.Enums;
+using SecureFolderFS.Sdk.Services;
 
 namespace SecureFolderFS.UI.ServiceImplementation
 {
@@ -26,9 +27,10 @@ public Task DisableTelemetryAsync()
         }
 
         /// <inheritdoc/>
-        public void TrackMessage(string eventName)
+        public void TrackMessage(string eventName, Severity severity)
         {
             _ = eventName;
+            _ = severity;
         }
 
         /// <inheritdoc/>

src/Platforms/SecureFolderFS.UI/ServiceImplementation/SentryTelemetryService.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using SecureFolderFS.Sdk.Enums;
 using SecureFolderFS.Sdk.Services;
 using SecureFolderFS.UI.Api;
 using Sentry;
@@ -53,13 +54,19 @@ public Task EnableTelemetryAsync()
         public Task DisableTelemetryAsync()
         {
             _sentryCompletion?.Dispose();
+            _sentryCompletion = null;
             return Task.CompletedTask;
         }
 
         /// <inheritdoc/>
-        public void TrackMessage(string eventName)
+        public void TrackMessage(string eventName, Severity severity)
         {
-            SentrySdk.CaptureMessage(eventName);
+            SentrySdk.CaptureMessage(eventName, severity switch
+            {
+                Severity.Warning => SentryLevel.Warning,
+                Severity.Critical => SentryLevel.Error,
+                _ => SentryLevel.Info
+            });
         }
 
         /// <inheritdoc/>

src/Platforms/SecureFolderFS.UI/ServiceImplementation/Settings/UserSettings.cs

@@ -2,6 +2,7 @@
 using OwlCore.Storage;
 using SecureFolderFS.Sdk.AppModels;
 using SecureFolderFS.Sdk.AppModels.Database;
+using SecureFolderFS.Sdk.Enums;
 using SecureFolderFS.Sdk.Models;
 using SecureFolderFS.Sdk.Services;
 using SecureFolderFS.Sdk.Services.Settings;
@@ -121,6 +122,9 @@ public virtual bool DisableRecentAccess
 
         protected virtual void UserSettings_PropertyChanged(object? sender, PropertyChangedEventArgs e)
         {
+            // Opt out
+            return;
+
             var eventName = e.PropertyName switch
             {
                 nameof(LockOnSystemLock) => $"{nameof(LockOnSystemLock)}: {LockOnSystemLock}",
@@ -136,7 +140,7 @@ protected virtual void UserSettings_PropertyChanged(object? sender, PropertyChan
             };
 
             if (eventName is not null)
-                TelemetryService.TrackMessage(eventName);
+                TelemetryService.TrackMessage(eventName, Severity.Default);
         }
     }
 }

src/Platforms/SecureFolderFS.Uno/Platforms/Desktop/SkiaWebDavFileSystem.Linux.cs

@@ -20,8 +20,7 @@ protected override async Task<IVFSRoot> MountAsync(
             var webDavWrapper = new WebDavWrapper(listener, requestDispatcher, mountPath);
             webDavWrapper.StartFileSystem();
 
-            // TODO: Currently using MemoryFolder because the check in SystemFolder might sometimes fail
-            return new WebDavRootFolder(webDavWrapper, new MemoryFolder(remotePath, options.VolumeName), specifics);
+            return new WebDavRootFolder(webDavWrapper, new SystemFolderEx(remotePath, options.VolumeName), specifics);
         }
 #endif
     }

src/Sdk/SecureFolderFS.Sdk/Services/ITelemetryService.cs

@@ -1,4 +1,5 @@
-using System;
+using SecureFolderFS.Sdk.Enums;
+using System;
 using System.Threading.Tasks;
 
 namespace SecureFolderFS.Sdk.Services
@@ -30,7 +31,8 @@ public interface ITelemetryService
         /// Reports and sends specified <paramref name="message"/> to the telemetry service.
         /// </summary>
         /// <param name="message">The name of the event that occurred within the app.</param>
-        void TrackMessage(string message);
+        /// <param name="severity">The severity of the message to log.</param>
+        void TrackMessage(string message, Severity severity);
 
         /// <summary>
         /// Reports and sends specified <paramref name="exception"/> to the telemetry service.

src/Sdk/SecureFolderFS.Sdk/ViewModels/Views/Settings/PrivacySettingsViewModel.cs

@@ -5,6 +5,7 @@
 using System.ComponentModel;
 using System.Threading;
 using System.Threading.Tasks;
+using SecureFolderFS.Sdk.Enums;
 
 namespace SecureFolderFS.Sdk.ViewModels.Views.Settings
 {
@@ -50,11 +51,11 @@ private async void UserSettings_PropertyChanged(object? sender, PropertyChangedE
             if (IsTelemetryEnabled)
             {
                 await TelemetryService.EnableTelemetryAsync();
-                TelemetryService.TrackMessage("Telemetry manually enabled");
+                TelemetryService.TrackMessage("[Telemetry] Enabled", Severity.Default);
             }
             else
             {
-                TelemetryService.TrackMessage("Telemetry manually disabled");
+                TelemetryService.TrackMessage("[Telemetry] Disabled", Severity.Default);
                 await TelemetryService.DisableTelemetryAsync();
             }
         }