Android: Synchronize with myTeamSpeak; keep each installation's default identity

Settings → myTeamSpeak gets Synchronize, with conflicts settled in
SyncConflictsScreen. The default identity is no longer a synced field:
an identity new to the account carries it only when the account has
none, and one brought here takes it only when we have none, so
installations stop flipping each other's default.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-10-15 16:37:04 +00:00
co-authored by Claude Opus 5.5
parent 116986c6fc
commit 1f61ad0b29
8 changed files with 294 additions and 31 deletions
@@ -326,6 +326,7 @@ public final class MyTeamSpeakSync {
}
item.varint(9, System.currentTimeMillis() / 1000);
kind.write(localId, content, labels);
if (onto == null) kind.writeNew(localId, content);
item.message(kind.contentField(), content);
return new Step(kind, Action.PUSH, uuid, localId, null,
new MyTeamSpeak.CloudItem(kind.itemClass(), uuid, version, item.toByteArray()));
@@ -15,6 +15,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -73,6 +74,10 @@ abstract sealed class SyncKind {
/** Writes the labelled fields of the local item into the content message. */
abstract void write(String localId, ProtobufMessage content, Set<String> labels) throws IOException;
/** Writes what only an item new to the account carries, after {@link #write}. */
void writeNew(String localId, ProtobufMessage content) {
}
/** Creates the cloud item here; returns its local id. */
abstract String add(SyncItem cloud) throws IOException;
@@ -86,7 +91,6 @@ abstract sealed class SyncKind {
static final String NICKNAME = "Nickname";
static final String PHONETIC = "Phonetic nickname";
static final String KEY = "Unique ID";
static final String DEFAULT = "Default identity";
IdentityKind(IdentityStore identities, Bookmarks bookmarks, Settings settings, Links links) {
super(identities, bookmarks, settings, links);
@@ -104,15 +108,14 @@ abstract sealed class SyncKind {
@Override
List<String> localIds() {
return identities.all().stream().map(IdentityEntry::getId).toList();
return identities.all().stream().map(IdentityEntry::getId).collect(Collectors.toList());
}
@Override
SyncFields localFields(String localId) {
IdentityEntry e = identities.byId(localId);
if (e == null) return null;
return fields(e.getName(), e.getNickname(), e.getPhoneticNickname(), e.getIdentity(),
localId.equals(settings.defaultIdentityId.get()));
return fields(e.getName(), e.getNickname(), e.getPhoneticNickname(), e.getIdentity());
}
@Override
@@ -120,18 +123,20 @@ abstract sealed class SyncKind {
if (!(item instanceof SyncItem.Identity i)) return null;
try {
return fields(i.name(), i.nickname(), i.phoneticNickname(),
IdentityStore.parseIdentityString(i.identity()), i.isDefault());
IdentityStore.parseIdentityString(i.identity()));
} catch (IOException malformed) {
return null;
}
}
private static SyncFields fields(String name, String nickname, String phonetic, LocalIdentity key,
boolean isDefault) {
/**
* Which identity is the default is each installation's own: it is not compared, and travels
* only with an identity new to the other side, which takes it when it has no default yet.
*/
private static SyncFields fields(String name, String nickname, String phonetic, LocalIdentity key) {
String uid = key.getUid().toBase64();
return new SyncFields().put(NAME, name).put(NICKNAME, nickname).put(PHONETIC, phonetic)
.put(KEY, uid + "#" + key.getKeyOffset(), uid + " (level " + key.getSecurityLevel() + ")")
.flag(DEFAULT, isDefault);
.put(KEY, uid + "#" + key.getKeyOffset(), uid + " (level " + key.getSecurityLevel() + ")");
}
@Override
@@ -152,7 +157,13 @@ abstract sealed class SyncKind {
if (labels.contains(NAME)) content.string(2, e.getName());
if (labels.contains(NICKNAME)) content.string(3, e.getNickname());
if (labels.contains(PHONETIC)) content.string(4, e.getPhoneticNickname());
if (labels.contains(DEFAULT)) content.varint(5, localId.equals(settings.defaultIdentityId.get()) ? 1 : 0);
}
/** The account's default only when it has none: another installation's default stays. */
@Override
void writeNew(String localId, ProtobufMessage content) {
boolean cloudHasDefault = links.cloudIdentities.values().stream().anyMatch(SyncItem.Identity::isDefault);
content.varint(5, !cloudHasDefault && localId.equals(settings.defaultIdentityId.get()) ? 1 : 0);
}
@Override
@@ -163,7 +174,9 @@ abstract sealed class SyncKind {
if (existing != null) return update(existing.getId(), cloud);
String name = i.name().isBlank() ? (i.nickname().isBlank() ? "TeamSpeak identity" : i.nickname()) : i.name();
IdentityEntry e = identities.add(name, key, i.nickname(), i.phoneticNickname());
if (i.isDefault()) settings.defaultIdentityId.set(e.getId());
if (i.isDefault() && identities.byId(settings.defaultIdentityId.get()) == null) {
settings.defaultIdentityId.set(e.getId());
}
return e.getId();
}
@@ -184,7 +197,7 @@ abstract sealed class SyncKind {
i.nickname(), i.phoneticNickname());
identities.remove(e, settings, null);
for (Bookmark b : using) b.identityId = replacement.getId();
if (wasDefault || i.isDefault()) settings.defaultIdentityId.set(replacement.getId());
if (wasDefault) settings.defaultIdentityId.set(replacement.getId());
return replacement.getId();
}
if (key.getKeyOffset() != e.getIdentity().getKeyOffset()) identities.setKeyOffset(e, key);
@@ -192,7 +205,6 @@ abstract sealed class SyncKind {
if (!i.nickname().equals(e.getNickname()) || !i.phoneticNickname().equals(e.getPhoneticNickname())) {
identities.setNicknames(e, i.nickname(), i.phoneticNickname());
}
if (i.isDefault()) settings.defaultIdentityId.set(localId);
return localId;
}
@@ -232,7 +244,7 @@ abstract sealed class SyncKind {
@Override
List<String> localIds() {
return bookmarks.all().stream().map(b -> b.id).toList();
return bookmarks.all().stream().map(b -> b.id).collect(Collectors.toList());
}
@Override
@@ -283,6 +283,40 @@ class MyTeamSpeakSyncTest {
assertEquals(0, cloud.items.get(1).size());
}
@Test
void eachInstallationKeepsItsOwnDefaultIdentity(@TempDir File dir) throws Exception {
Client a = new Client(new File(dir, "a"));
Client b = new Client(new File(dir, "b"));
for (Client c : List.of(a, b)) {
c.in(() -> {
IdentityEntry mine = c.identities.generate("Mine", 1);
c.settings.defaultIdentityId.set(mine.getId());
});
}
String aDefault = a.settings.defaultIdentityId.get();
String bDefault = b.settings.defaultIdentityId.get();
a.sync();
b.sync();
a.sync();
assertEquals(aDefault, a.settings.defaultIdentityId.get());
assertEquals(bDefault, b.settings.defaultIdentityId.get());
long defaults = 0;
for (String uuid : cloud.items.get(1).keySet()) {
if (eu.lixko.ts3j.client.teamspeak.SyncItemDecoder.decode(cloud.plain(1, uuid))
instanceof eu.lixko.ts3j.client.teamspeak.SyncItem.Identity i && i.isDefault()) defaults++;
}
assertEquals(1, defaults, "the account keeps one default");
assertEquals(new MyTeamSpeakSync.Result(0, 0), a.sync());
assertEquals(new MyTeamSpeakSync.Result(0, 0), b.sync());
// A fresh installation takes the account's.
Client c = new Client(new File(dir, "c"));
c.sync();
assertEquals(a.identities.byId(aDefault).getUniqueId(),
c.identities.byId(c.settings.defaultIdentityId.get()).getUniqueId());
}
@Test
void anItemChangedOnBothSidesIsTheUsersToSettle(@TempDir File dir) throws Exception {
Client a = new Client(new File(dir, "a"));