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

Add new dbus message received signals with extendable extras map

Browse source
This commit is contained in:
AsamK 2021-10-31 12:40:21 +01:00
parent 204aa31885
commit f39983f78a
3 changed files with 330 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

137
src/main/java/org/asamk/Signal.java
View file

@ -10,8 +10,10 @@ import org.freedesktop.dbus.exceptions.DBusExecutionException;
import org.freedesktop.dbus.interfaces.DBusInterface;
import org.freedesktop.dbus.interfaces.Properties;
import org.freedesktop.dbus.messages.DBusSignal;
import org.freedesktop.dbus.types.Variant;
import java.util.List;
import java.util.Map;
/**
* DBus interface for the org.asamk.Signal service.
@ -166,6 +168,51 @@ public interface Signal extends DBusInterface {
void submitRateLimitChallenge(String challenge, String captchaString) throws IOErrorException;
class MessageReceivedV2 extends DBusSignal {
private final long timestamp;
private final String sender;
private final byte[] groupId;
private final String message;
private final Map<String, Variant<?>> extras;
public MessageReceivedV2(
String objectpath,
long timestamp,
String sender,
byte[] groupId,
String message,
final Map<String, Variant<?>> extras
) throws DBusException {
super(objectpath, timestamp, sender, groupId, message, extras);
this.timestamp = timestamp;
this.sender = sender;
this.groupId = groupId;
this.message = message;
this.extras = extras;
}
public long getTimestamp() {
return timestamp;
}
public String getSender() {
return sender;
}
public byte[] getGroupId() {
return groupId;
}
public String getMessage() {
return message;
}
public Map<String, Variant<?>> getExtras() {
return extras;
}
}
class MessageReceived extends DBusSignal {
private final long timestamp;
@ -231,6 +278,44 @@ public interface Signal extends DBusInterface {
}
}
class ReceiptReceivedV2 extends DBusSignal {
private final long timestamp;
private final String sender;
private final String type;
private final Map<String, Variant<?>> extras;
public ReceiptReceivedV2(
String objectpath,
long timestamp,
String sender,
final String type,
final Map<String, Variant<?>> extras
) throws DBusException {
super(objectpath, timestamp, sender, type, extras);
this.timestamp = timestamp;
this.sender = sender;
this.type = type;
this.extras = extras;
}
public long getTimestamp() {
return timestamp;
}
public String getSender() {
return sender;
}
public String getReceiptType() {
return type;
}
public Map<String, Variant<?>> getExtras() {
return extras;
}
}
class SyncMessageReceived extends DBusSignal {
private final long timestamp;
@ -283,6 +368,58 @@ public interface Signal extends DBusInterface {
}
}
class SyncMessageReceivedV2 extends DBusSignal {
private final long timestamp;
private final String source;
private final String destination;
private final byte[] groupId;
private final String message;
private final Map<String, Variant<?>> extras;
public SyncMessageReceivedV2(
String objectpath,
long timestamp,
String source,
String destination,
byte[] groupId,
String message,
final Map<String, Variant<?>> extras
) throws DBusException {
super(objectpath, timestamp, source, destination, groupId, message, extras);
this.timestamp = timestamp;
this.source = source;
this.destination = destination;
this.groupId = groupId;
this.message = message;
this.extras = extras;
}
public long getTimestamp() {
return timestamp;
}
public String getSource() {
return source;
}
public String getDestination() {
return destination;
}
public byte[] getGroupId() {
return groupId;
}
public String getMessage() {
return message;
}
public Map<String, Variant<?>> getExtras() {
return extras;
}
}
class StructDevice extends Struct {
@Position(0)