Some more fixes

remindersdevs · May 1, 2023 · 43e35ac · 43e35ac
1 parent 8165e46
commit 43e35ac
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/po/remembrance.pot b/po/remembrance.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: remembrance\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-05-01 11:35-0400\n"
+"POT-Creation-Date: 2023-05-01 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -1229,10 +1229,10 @@ msgstr ""
 msgid "Mark as completed"
 msgstr ""
 
-#: src/service/backend.py:1194
+#: src/service/backend.py:1195
 msgid "Local Reminders"
 msgstr ""
 
-#: src/service/backend.py:1856
+#: src/service/backend.py:1857
 msgid "Local"
 msgstr ""
diff --git a/src/browser/application.py b/src/browser/application.py
@@ -172,7 +172,7 @@ def do_activate(self):
         self.service.connect('g-signal::RemindersCompleted', self.reminders_completed_cb)
         self.service.connect('g-signal::ReminderRemoved', self.reminder_deleted_cb)
         self.service.connect('g-signal::ReminderUpdated', self.reminder_updated_cb)
-        self.service.connect('g-signal::ReminderShown', self.repeat_updated_cb)
+        self.service.connect('g-signal::ReminderShown', self.reminder_shown_cb)
         self.service.connect('g-signal::RemindersUpdated', self.reminders_updated_cb)
         self.service.connect('g-signal::RemindersRemoved', self.reminders_removed_cb)
         self.service.connect('g-signal::ListUpdated', self.list_updated_cb)
@@ -261,8 +261,8 @@ def reminders_completed_cb(self, proxy, sender_name, signal_name, parameters):
             self.win.invalidate_filter()
             self.win.reminders_list.invalidate_sort()
 
-    def repeat_updated_cb(self, proxy, sender_name, signal_name, parameters):
-        reminder_id = parameters.unpack()
+    def reminder_shown_cb(self, proxy, sender_name, signal_name, parameters):
+        reminder_id = parameters.unpack()[0]
         reminder = self.win.reminder_lookup_dict[reminder_id]
         reminder.refresh_time()
 

diff --git a/src/service/backend.py b/src/service/backend.py
@@ -822,6 +822,7 @@ def show_notification(self, reminder_id):
             else:
                 self.sound.play_full({GSound.ATTR_EVENT_ID: 'bell'}, None, self._sound_cb)
         self._shown(reminder_id)
+        self.do_emit('ReminderShown', GLib.Variant('(s)', (reminder_id,)))
         self.countdowns.dict[reminder_id]['id'] = 0
 
     def _sound_cb(self, context, result):

diff --git a/src/service/caldav.py b/src/service/caldav.py
@@ -84,7 +84,7 @@ def load_users(self):
             self.users = {}
 
     def login(self, name, url, username, password):
-        user_id = self.reminders._do_generate_id(self.users.keys())
+        user_id = self.reminders._do_generate_id()
         if username == '':
             username = None
         if password == '':
@@ -347,7 +347,10 @@ def get_lists(self, removed_list_ids, old_lists, synced_ids, only_user_id = None
         except:
             pass
 
-        for user_id in self.principals:
+        for user_id in self.users.keys():
+            if user_id not in self.principals.keys():
+                not_synced.append(user_id)
+                continue
             if only_user_id is not None and user_id != only_user_id:
                 not_synced.append(user_id)
                 continue
@@ -389,7 +392,7 @@ def get_lists(self, removed_list_ids, old_lists, synced_ids, only_user_id = None
                 else:
                     logger.exception(error)
                     not_synced.append(user_id)
-            except requests.ConnectionError:
+            except (requests.ConnectionError, requests.Timeout):
                 not_synced.append(user_id)
             except Exception as error:
                 logger.exception(error)