webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-30 11:00:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Migrate local group to v2 if another member has migrated it

Browse source
This commit is contained in:
AsamK 2020-12-12 11:14:36 +01:00
parent f6061f95de
commit c10910e466
7 changed files with 101 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
View file

@ -1,6 +1,7 @@
package org.asamk.signal;
import org.asamk.Signal;
import org.asamk.signal.manager.GroupUtils;
import org.asamk.signal.manager.Manager;
import org.freedesktop.dbus.connections.impl.DBusConnection;
import org.freedesktop.dbus.exceptions.DBusException;
@ -117,7 +118,7 @@ public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
if (message.getGroupContext().get().getGroupV1().isPresent()) {
groupId = message.getGroupContext().get().getGroupV1().get().getGroupId();
} else if (message.getGroupContext().get().getGroupV2().isPresent()) {
groupId = m.getGroupId(message.getGroupContext().get().getGroupV2().get().getMasterKey());
groupId = GroupUtils.getGroupId(message.getGroupContext().get().getGroupV2().get().getMasterKey());
} else {
groupId = null;
}