Apply code review

Author: d2dyno1

src/Core/SecureFolderFS.Core.Cryptography/NameCrypt/AesSivNameCrypt.cs

@@ -15,7 +15,8 @@ public AesSivNameCrypt(KeyPair keyPair, string fileNameEncodingId)
         {
             _aesSiv256 = keyPair.UseKeys((dekKey, macKey) =>
             {
-                return AesSiv256.CreateInstance(dekKey.ToArray(), macKey.ToArray()); // Note: AesSiv128 requires a byte[] key.
+                // Note: AesSiv256 requires a byte[] key.
+                return AesSiv256.CreateInstance(dekKey.ToArray(), macKey.ToArray());
             });
         }
 

src/Core/SecureFolderFS.Core.MobileFS/Platforms/Android/FileSystem/FileSystemProvider.Helpers.cs

@@ -90,16 +90,9 @@ void AddFlags()
             }
             void AddMimeType() => row.Add(Document.ColumnMimeType, GetMimeForStorable(storable));
             void AddDocumentId() => row.Add(Document.ColumnDocumentId, documentId);
-            void AddDisplayName()
-            {
-                if (string.IsNullOrEmpty(storable.Name))
-                {
-                    var safRoot = _rootCollection?.GetSafRootForRootId(documentId?.Split(':')[0] ?? string.Empty);
-                    row.Add(Document.ColumnDisplayName, safRoot?.StorageRoot.Options.VolumeName ?? storable.Name);
-                }
-                else
-                    row.Add(Document.ColumnDisplayName, storable.Name);
-            }
+            void AddDisplayName() => row.Add(Document.ColumnDisplayName, string.IsNullOrEmpty(storable.Name)
+                ? safRoot.StorageRoot.Options.VolumeName
+                : storable.Name);
         }
 
         private string? GetDocumentIdForStorable(IStorable storable, string? rootId)
@@ -111,10 +104,9 @@ void AddDisplayName()
             if (safRoot is null)
                 return null;
 
-            if (storable.Id == safRoot.StorageRoot.PlaintextRoot.Id)
-                return $"{safRoot.RootId}:";
-
-            return $"{safRoot.RootId}:{storable.Id}";
+            return storable.Id == safRoot.StorageRoot.PlaintextRoot.Id
+                ? $"{safRoot.RootId}:"
+                : $"{safRoot.RootId}:{storable.Id}";
         }
 
         private IStorable? GetStorableForDocumentId(string documentId)
@@ -142,7 +134,7 @@ void AddDisplayName()
             if (string.IsNullOrEmpty(path))
                 return safRoot.StorageRoot.PlaintextRoot;
 
-            return safRoot.StorageRoot.PlaintextRoot.GetItemByRelativePathAsync(path).ConfigureAwait(false).GetAwaiter().GetResult();
+            return SafetyHelpers.NoFailureResult(() => safRoot.StorageRoot.PlaintextRoot.GetItemByRelativePathAsync(path).ConfigureAwait(false).GetAwaiter().GetResult());
         }
 
         private static string GetMimeForStorable(IStorable storable)

src/Core/SecureFolderFS.Core.MobileFS/Platforms/Android/FileSystem/FileSystemProvider.Main.cs

@@ -53,9 +53,7 @@ public override bool OnCreate()
                 rid = Constants.Android.Saf.IC_LOCK_LOCK;
 
             foreach (var item in _rootCollection?.Roots ?? Enumerable.Empty<SafRoot>())
-            {
                 AddRoot(matrix, item, rid);
-            }
 
             return matrix;
         }

src/Platforms/SecureFolderFS.Maui/AppShell.xaml.cs

@@ -29,7 +29,7 @@ public AppShell()
         /// <inheritdoc/>
         public void Receive(VaultLockedMessage message)
         {
-            Vibration.Vibrate(200d);
+            Vibration.Vibrate(80d);
         }
 
         private async void AppShell_Loaded(object? sender, EventArgs e)

src/Platforms/SecureFolderFS.Maui/UserControls/HealthScanControl.xaml

@@ -67,7 +67,7 @@
                 <ContentView
                     Grid.Column="2"
                     Content="{Binding IconSlot, Mode=OneWay, Source={x:Reference ThisControl}}"
-                    IsVisible="{Binding IconSlot, Mode=OneWay, Source={x:Reference ThisControl}}" />
+                    IsVisible="{Binding IconSlot, Mode=OneWay, Source={x:Reference ThisControl}, Converter={StaticResource NullToBoolConverter}}" />
             </Grid>
         </Grid>
 

src/Platforms/SecureFolderFS.Maui/UserControls/Widgets/HealthWidget.xaml

@@ -8,26 +8,24 @@
     xmlns:uc="clr-namespace:SecureFolderFS.Maui.UserControls"
     x:Name="RootControl">
 
-    <Grid>
-        <uc:HealthScanControl
-            x:Name="ScanControl"
-            Title="{Binding StatusTitle, Mode=OneWay, Source={x:Reference RootControl}}"
-            Clicked="HealthScanControl_Clicked"
-            IsProgressing="{Binding IsProgressing, Mode=OneWay, Source={x:Reference RootControl}}"
-            Severity="{Binding Severity, Mode=OneWay, Source={x:Reference RootControl}}"
-            Subtitle="{Binding LastCheckedText, Mode=OneWay, Source={x:Reference RootControl}}">
-            <uc:HealthScanControl.IconSlot>
-                <Grid>
-                    <mi:MauiIcon
-                        Icon="{mi_material:Material ChevronRight}"
-                        IconColor="White"
-                        OnPlatforms="Android" />
-                    <mi:MauiIcon
-                        Icon="{mi_cupertino:Cupertino ChevronRight}"
-                        IconColor="White"
-                        OnPlatforms="iOS" />
-                </Grid>
-            </uc:HealthScanControl.IconSlot>
-        </uc:HealthScanControl>
-    </Grid>
+    <uc:HealthScanControl
+        x:Name="ScanControl"
+        Title="{Binding StatusTitle, Mode=OneWay, Source={x:Reference RootControl}}"
+        Clicked="HealthScanControl_Clicked"
+        IsProgressing="{Binding IsProgressing, Mode=OneWay, Source={x:Reference RootControl}}"
+        Severity="{Binding Severity, Mode=OneWay, Source={x:Reference RootControl}}"
+        Subtitle="{Binding LastCheckedText, Mode=OneWay, Source={x:Reference RootControl}}">
+        <uc:HealthScanControl.IconSlot>
+            <Grid>
+                <mi:MauiIcon
+                    Icon="{mi_material:Material ChevronRight}"
+                    IconColor="White"
+                    OnPlatforms="Android" />
+                <mi:MauiIcon
+                    Icon="{mi_cupertino:Cupertino ChevronRight}"
+                    IconColor="White"
+                    OnPlatforms="iOS" />
+            </Grid>
+        </uc:HealthScanControl.IconSlot>
+    </uc:HealthScanControl>
 </ContentView>

src/Shared/SecureFolderFS.Shared/Logging/FileOutputLoggerProvider.cs

@@ -2,6 +2,7 @@
 using System.Collections.Concurrent;
 using System.IO;
 using Microsoft.Extensions.Logging;
+using SecureFolderFS.Shared.Helpers;
 
 namespace SecureFolderFS.Shared.Logging
 {
@@ -34,9 +35,7 @@ public ILogger CreateLogger(string categoryName)
         internal void WriteMessage(string message)
         {
             lock (_writeLock)
-            {
-                File.AppendAllText(_filePath, message + Environment.NewLine);
-            }
+                SafetyHelpers.NoFailure(() => File.AppendAllText(_filePath, message + Environment.NewLine));
         }
 
         /// <inheritdoc/>