marvin.weiler/signal-cli-with-http-logging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve comment in SessionStore

Browse Source
This commit is contained in:
AsamK 2021-09-04 10:48:22 +02:00
parent 43bcc95713
commit 891c05210e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
View File

@ -179,7 +179,8 @@ public class SessionStore implements SignalServiceSessionStore {
public void mergeRecipients(RecipientId recipientId, RecipientId toBeMergedRecipientId) { public void mergeRecipients(RecipientId recipientId, RecipientId toBeMergedRecipientId) {
synchronized (cachedSessions) { synchronized (cachedSessions) {
final var otherHasSession = getKeysLocked(toBeMergedRecipientId).size() > 0; final var keys = getKeysLocked(toBeMergedRecipientId);
final var otherHasSession = keys.size() > 0;
if (!otherHasSession) { if (!otherHasSession) {
return; return;
} }
@ -189,8 +190,7 @@ public class SessionStore implements SignalServiceSessionStore {
logger.debug("To be merged recipient had sessions, deleting."); logger.debug("To be merged recipient had sessions, deleting.");
deleteAllSessions(toBeMergedRecipientId); deleteAllSessions(toBeMergedRecipientId);
} else { } else {
logger.debug("To be merged recipient had sessions, re-assigning to the new recipient."); logger.debug("Only to be merged recipient had sessions, re-assigning to the new recipient.");
final var keys = getKeysLocked(toBeMergedRecipientId);
for (var key : keys) { for (var key : keys) {
final var session = loadSessionLocked(key); final var session = loadSessionLocked(key);
deleteSessionLocked(key); deleteSessionLocked(key);