ZacharyZhang-NY/ELY-Browser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(sync): preserve private profile boundaries

Browse Source
This commit is contained in:
ZacharyZhang-NY
2026-07-09 22:48:44 -04:00
parent 31fc1acf17
commit 7d70db6da9
2 changed files with 82 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ely_browser_core/src/state/sync_profiles.rs
+17 -7
View File
@@ -24,18 +24,28 @@ impl BrowserCore {
summary.record_skipped();
return Ok(());
}
let name = record.name.trim().to_string();
let existing_index =
self.profiles.iter().position(|profile| profile.id() == &profile_id).or_else(|| {
self.profiles
.iter()
.position(|profile| profile.name().eq_ignore_ascii_case(record.name.trim()))
let existing_index = self
.profiles
.iter()
.position(|profile| profile.id() == &profile_id && profile.kind() == &kind)
.or_else(|| {
self.profiles.iter().position(|profile| {
profile.kind() == &kind && profile.name().eq_ignore_ascii_case(&name)
})
});
let id = existing_index
.and_then(|index| self.profiles.get(index).map(|profile| profile.id().clone()))
.unwrap_or_else(|| profile_id.clone());
.unwrap_or_else(|| {
if self.profiles.iter().any(|profile| profile.id() == &profile_id) {
ProfileId::new()
} else {
profile_id.clone()
}
});
context.register_profile_alias(profile_id, id.clone());
let mut profile = Profile::new(record.name, record.color_hex, kind);
let mut profile = Profile::new(name, record.color_hex, kind);
profile.set_sync_policy(record.sync_policy.into());
let profile = Profile::restore(id, profile);