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

Prevent crash when receiving already migrated group v1 from storage

Browse Source 
Fixes #1471
This commit is contained in:
AsamK 2024-02-25 19:41:10 +01:00
parent 6c44662496
commit 57164ad7fb
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
View File

@ -229,22 +229,26 @@ public class GroupStore {
public GroupInfoV1 getOrCreateGroupV1(GroupIdV1 groupId) {
try (final var connection = database.getConnection()) {
var group = getGroup(connection, groupId);
if (group != null) {
return group;
}
if (getGroupV2ByV1Id(connection, groupId) == null) {
return new GroupInfoV1(groupId);
}
return null;
return getOrCreateGroupV1(connection, groupId);
} catch (SQLException e) {
throw new RuntimeException("Failed read from group store", e);
}
}
public GroupInfoV1 getOrCreateGroupV1(final Connection connection, final GroupIdV1 groupId) throws SQLException {
var group = getGroup(connection, groupId);
if (group != null) {
return group;
}
if (getGroupV2ByV1Id(connection, groupId) == null) {
return new GroupInfoV1(groupId);
}
return null;
}
public GroupInfoV2 getGroupOrPartialMigrate(
Connection connection, final GroupMasterKey groupMasterKey
) throws SQLException {

18
lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV1RecordProcessor.java
View File

@ -112,14 +112,16 @@ public final class GroupV1RecordProcessor extends DefaultStorageRecordProcessor<
final var groupV1Record = update.newRecord();
final var groupIdV1 = GroupId.v1(groupV1Record.getGroupId());
final var group = account.getGroupStore().getGroup(connection, groupIdV1);
group.setBlocked(groupV1Record.isBlocked());
account.getGroupStore().updateGroup(connection, group);
account.getGroupStore()
.storeStorageRecord(connection,
group.getGroupId(),
groupV1Record.getId(),
groupV1Record.toProto().encode());
final var group = account.getGroupStore().getOrCreateGroupV1(connection, groupIdV1);
if (group != null) {
group.setBlocked(groupV1Record.isBlocked());
account.getGroupStore().updateGroup(connection, group);
account.getGroupStore()
.storeStorageRecord(connection,
group.getGroupId(),
groupV1Record.getId(),
groupV1Record.toProto().encode());
}
}
@Override