Added an option to bypass the call to resolve_well_known_caldav () (#1780)

Author: nijakow

src/Dialogs/Preferences/Pages/Accounts/CalDAVSetup.vala

@@ -32,6 +32,7 @@ public class Dialogs.Preferences.Pages.CalDAVSetup : Dialogs.Preferences.Pages.B
     // Advanced Options
     private Adw.EntryRow calendar_home_entry;
     private Widgets.IgnoreSSLSwitchRow ignore_ssl_row;
+    private Widgets.BypassResolveSwitchRow bypass_resolve_row;
 
     public CalDAVSetup (Adw.PreferencesDialog preferences_dialog, Accounts accounts_page) {
         Object (
@@ -65,6 +66,7 @@ public class Dialogs.Preferences.Pages.CalDAVSetup : Dialogs.Preferences.Pages.B
         calendar_home_entry.title = _("Calendar Home URL");
 
         ignore_ssl_row = new Widgets.IgnoreSSLSwitchRow ();
+        bypass_resolve_row = new Widgets.BypassResolveSwitchRow ();
 
         var advanced_options_revealer = new Gtk.Revealer () {
             transition_type = Gtk.RevealerTransitionType.SLIDE_DOWN,
@@ -83,6 +85,7 @@ public class Dialogs.Preferences.Pages.CalDAVSetup : Dialogs.Preferences.Pages.B
 
         advanced_entries_group.add (calendar_home_entry);
         advanced_entries_group.add (ignore_ssl_row);
+        advanced_entries_group.add (bypass_resolve_row);
 
         login_button = new Widgets.LoadingButton.with_label (_("Log In")) {
             margin_top = 12,
@@ -178,7 +181,18 @@ public class Dialogs.Preferences.Pages.CalDAVSetup : Dialogs.Preferences.Pages.B
             return;
         }
 
-        var dav_endpoint = yield Services.CalDAV.Core.get_default ().resolve_well_known_caldav (new Soup.Session (), server_entry.text, ignore_ssl_row.active);
+        /*
+         * The `resolve_well_known_caldav ()` function can fail on misconfigured CalDAV servers where
+         * the `Location` header doesn't contain the configured port.
+         * This option allows us to bypass the call.
+         */
+        var dav_endpoint = "";
+        var bypass_resolve = bypass_resolve_row.active;
+        if (bypass_resolve) {
+            dav_endpoint = server_entry.text;
+        } else {
+            dav_endpoint = yield Services.CalDAV.Core.get_default ().resolve_well_known_caldav (new Soup.Session (), server_entry.text, ignore_ssl_row.active);
+        }
 
         var calendar_home = "";
 

src/Widgets/BypassResolveSwitchRow.vala

@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2025 Alain M. (https://github.com/alainm23/planify)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ *
+ * Authored by: nijakow (https://github.com/nijakow)
+ */
+
+public class Widgets.BypassResolveSwitchRow : Adw.ActionRow {
+    private Gtk.Switch toggle;
+
+    public bool active {
+        get { return toggle.active; }
+        set { toggle.active = value; }
+    }
+
+    public BypassResolveSwitchRow () {
+        title = _("Bypass Location Resolve");
+        subtitle = _("Workaround for CalDAV connection issues with connections using non-default ports");
+
+        toggle = new Gtk.Switch () {
+            valign = Gtk.Align.CENTER,
+            halign = Gtk.Align.END
+        };
+
+        add_suffix (toggle);
+        activatable_widget = toggle;
+
+        toggle.state_set.connect ((state) => {
+            if (state) {
+                var dialog = new Adw.AlertDialog (
+                    _("Warning"),
+                    _("This will disable the CalDAV resolve process.\nProceed at your own risk")
+                );
+                dialog.add_response ("cancel", _("Cancel"));
+                dialog.add_response ("accept", _("Continue Anyway"));
+                dialog.set_response_appearance ("accept", Adw.ResponseAppearance.DESTRUCTIVE);
+
+                dialog.response.connect ((response) => {
+                    if (response == "accept") {
+                            toggle.state = true;
+                            toggle.active = true;
+                        } else {
+                            toggle.state = false;
+                            toggle.active = false;
+                        }
+                });
+
+                dialog.present (Planify._instance.main_window);
+                return true; // prevent immediate state change
+            }
+            return false;
+        });
+
+    }
+}
+
+

src/meson.build

@@ -63,6 +63,7 @@ sources = files(
   'Widgets/ReorderChild.vala',
   'Widgets/FilterFlowBox.vala',
   'Widgets/FilterFlowBoxChild.vala',
+  'Widgets/BypassResolveSwitchRow.vala',
   'Widgets/IgnoreSSLSwitchRow.vala',
   'Widgets/Attachments.vala',
   'Widgets/AttachmentRow.vala',