Skip to content

Fix KeyError in _remove_buddy by safely handling missing buddy keys #1090

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AYUSH676-JARVIS wants to merge 3 commits into
base: master
Choose a base branch
from
+24 −8
Open

Fix KeyError in _remove_buddy by safely handling missing buddy keys #1090

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a06a6c3
Fix KeyError in _remove_buddy by safely handling missing buddy keys
AYUSH676-JARVIS Mar 23, 2026
1bf02f9
Improve buddy state handling in notify callback to avoid inconsistent…
AYUSH676-JARVIS Mar 23, 2026
55f90d5
Fix indentation + duplicate assignment in MeshBox
AYUSH676-JARVIS Mar 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions src/jarabe/desktop/meshbox.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,18 +432,34 @@ def _add_buddy(self, buddy_model):

def _remove_buddy(self, buddy_model):
logging.debug('MeshBox._remove_buddy')
icon = self._buddies[buddy_model.props.key]

key = buddy_model.props.key
icon = self._buddies.get(key)

if not icon:
logging.warning(f"Buddy key {key} not found during removal")
return

self.remove(icon)
del self._buddies[buddy_model.props.key]
del self._buddies[key]

def __buddy_notify_current_activity_cb(self, buddy_model, pspec):
logging.debug('MeshBox.__buddy_notify_current_activity_cb %s',
buddy_model.props.current_activity)
if buddy_model.props.current_activity is None:
if buddy_model.props.key not in self._buddies:
key = buddy_model.props.key
activity = buddy_model.props.current_activity
logging.debug(f"[STATE] key={key}, activity={activity}, exists={key in self._buddies}")

if activity is None:
if key not in self._buddies:
logging.debug(f"Adding buddy {key}")
self._add_buddy(buddy_model)
elif buddy_model.props.key in self._buddies:
self._remove_buddy(buddy_model)
else:
logging.debug(f"Buddy {key} already exists, skipping add")
else:
if key in self._buddies:
logging.debug(f"Removing buddy {key}")
self._remove_buddy(buddy_model)
else:
logging.debug(f"Buddy {key} not found, skipping remove")

def _add_activity(self, activity_model):
icon = ActivityView(activity_model)
Expand Down