Merge pull request #274 from LiamMorrow/add-trust-anchors

LiamMorrow · Sep 22, 2024 · 96d7a04 · 96d7a04
2 parents 01c6956 + bc25df4
commit 96d7a04
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/LiftLog.Maui/Platforms/Android/Resources/xml/network_security_config.xml b/LiftLog.Maui/Platforms/Android/Resources/xml/network_security_config.xml
@@ -3,4 +3,12 @@
     <domain-config cleartextTrafficPermitted="true">
         <domain includeSubdomains="true">10.0.2.2</domain>
     </domain-config>
+    <base-config>
+        <trust-anchors>
+        <!-- Trust preinstalled CAs -->
+        <certificates src="system" />
+        <!-- Additionaly trusted user added CAs -->
+        <certificates src="user"/>
+    </trust-anchors>
+    </base-config>
 </network-security-config>
diff --git a/LiftLog.Ui/Store/Settings/SettingsEffects.cs b/LiftLog.Ui/Store/Settings/SettingsEffects.cs
@@ -253,18 +253,25 @@ public async Task ExecuteRemoteBackup(ExecuteRemoteBackupAction action, IDispatc
         }
         catch (HttpRequestException ex) when (ex.StatusCode is null)
         {
+            logger.LogWarning(ex, "Failed to backup data to remote server [connection failure]");
             dispatcher.Dispatch(
                 new ToastAction("Failed to backup data to remote server [connection failure]")
             );
         }
         catch (HttpRequestException ex)
         {
+            logger.LogWarning(
+                ex,
+                "Failed to backup data to remote server [{StatusCode}]",
+                ex.StatusCode
+            );
             dispatcher.Dispatch(
                 new ToastAction("Failed to backup data to remote server [" + ex.StatusCode + "]")
             );
         }
-        catch
+        catch (Exception ex)
         {
+            logger.LogWarning(ex, "Failed to backup data to remote server [unknown]");
             dispatcher.Dispatch(
                 new ToastAction("Failed to backup data to remote server [unknown]")
             );