Fix #1160 #1155

alainm23 · Feb 28, 2024 · 81a3266 · 81a3266
1 parent 11f23ff
commit 81a3266
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/core/QuickAdd.vala b/core/QuickAdd.vala
@@ -51,13 +51,12 @@ public class Layouts.QuickAdd : Adw.Bin {
 			css_classes = { "flat" }
 		};
 
-        content_entry = new Widgets.Entry () {
+        content_entry = new Gtk.Entry () {
             hexpand = true,
-            placeholder_text = _("To-do name")
+            placeholder_text = _("To-do name"),
+            css_classes = { "flat" }
         };
 
-        content_entry.add_css_class (Granite.STYLE_CLASS_FLAT);
-
         var content_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6) {
             valign = Gtk.Align.CENTER,
             hexpand = true,
@@ -279,8 +278,9 @@ public class Layouts.QuickAdd : Adw.Bin {
         description_controller_key.key_pressed.connect ((keyval, keycode, state) => {
             if ((ctrl_pressed || shift_pressed) && keyval == 65293) {
                 add_item ();
-                return true;
             }
+
+            return false;
         });
 
         var event_controller_key = new Gtk.EventControllerKey ();

diff --git a/core/Services/CalDAV.vala b/core/Services/CalDAV.vala
@@ -277,6 +277,7 @@ public class Services.CalDAV : GLib.Object {
         var network_monitor = GLib.NetworkMonitor.get_default ();
 		network_monitor.network_changed.connect (() => {
 			if (GLib.NetworkMonitor.get_default ().network_available &&
+                is_logged_in () &&
 			    Services.Settings.get_default ().settings.get_boolean ("caldav-sync-server")) {
 				sync_async ();
 			}

diff --git a/core/Services/Todoist.vala b/core/Services/Todoist.vala
@@ -57,6 +57,7 @@ public class Services.Todoist : GLib.Object {
 		var network_monitor = GLib.NetworkMonitor.get_default ();
 		network_monitor.network_changed.connect (() => {
 			if (GLib.NetworkMonitor.get_default ().network_available &&
+				is_logged_in () &&
 			    Services.Settings.get_default ().settings.get_boolean ("todoist-sync-server")) {
 				sync_async ();
 			}

diff --git a/src/MainWindow.vala b/src/MainWindow.vala
@@ -271,7 +271,7 @@ public class MainWindow : Adw.ApplicationWindow {
 			});
 		});
 
-		if (!Services.Todoist.get_default ().invalid_token ()) {
+		if (Services.Todoist.get_default ().is_logged_in ()) {
 			Timeout.add (Constants.SYNC_TIMEOUT, () => {
 				Services.Todoist.get_default ().run_server ();
 				return GLib.Source.REMOVE;